1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-15 03:14:23 +00:00
freebsd-ports/databases/tcl-Mysql/files/patch-redundant-defaults
Mikhail Teterin d9de5588ed Make buildable with newer MySQL clients -- 4 and 5 -- but keep
compatible with the 3 -- mysql_error now returns `const char *', and
there is no mysql_connect any more. Default to MySQL-4.x for now. Bump
PORTREVISION.

Reported by:	Robert Andrews
2004-11-11 18:06:27 +00:00

34 lines
988 B
Plaintext

--- sql-mysql.cc Wed Jan 12 20:50:03 2000
+++ sql-mysql.cc Wed Nov 10 17:40:19 2004
@@ -19,7 +19,7 @@
// -------------------------------------------------------------
-char *
+const char *
Sql_mysql::getErrorMsg() {
- char *msg = mysql_error(&mysql);
+ const char *msg = mysql_error(&mysql);
if (*msg == '\0') {
return errormsg;
@@ -72,5 +72,5 @@
// -------------------------------------------------------------
int
-Sql_mysql::numRows(int resHandle=0) {
+Sql_mysql::numRows(int resHandle) {
if (!results[resHandle]) { return -1; }
return(mysql_num_rows(results[resHandle]));
@@ -110,5 +110,5 @@
// -------------------------------------------------------------
void
-Sql_mysql::endquery(int resHandle=0) {
+Sql_mysql::endquery(int resHandle) {
if (!results[resHandle]) return;
mysql_free_result(results[resHandle]);
@@ -121,5 +121,5 @@
// party.
Sql_row *
-Sql_mysql::fetchrow(int resHandle=0) {
+Sql_mysql::fetchrow(int resHandle) {
if (!results[resHandle]) {