diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2004-11-12 17:17:43 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2004-11-12 17:17:43 +0000 |
| commit | 88138b7f28ec86642979293ff6100de9f65ff8c8 (patch) | |
| tree | f3c909b2ddafd0b1e633998004224b91685c6577 /databases/tcl-Mysql/files | |
| parent | Update to 1.9.15, bugfix release (diff) | |
Grr... Forgot to `cvs add' the new patches prior to committing. Again...
Reported by: Robert Andrews
Diffstat (limited to 'databases/tcl-Mysql/files')
| -rw-r--r-- | databases/tcl-Mysql/files/patch-const-error | 42 | ||||
| -rw-r--r-- | databases/tcl-Mysql/files/patch-real_connect | 12 |
2 files changed, 54 insertions, 0 deletions
diff --git a/databases/tcl-Mysql/files/patch-const-error b/databases/tcl-Mysql/files/patch-const-error new file mode 100644 index 000000000000..63de9b834062 --- /dev/null +++ b/databases/tcl-Mysql/files/patch-const-error @@ -0,0 +1,42 @@ +--- sql-mysql.h Mon Sep 14 06:51:37 1998 ++++ sql-mysql.h Wed Nov 10 17:40:15 2004 +@@ -31,4 +31,4 @@ + Sql_row *fetchrow(int resHandle=0); + +- char *getErrorMsg(); ++ const char *getErrorMsg(); + }; +--- sql-interface.h Mon Sep 14 06:52:41 1998 ++++ sql-interface.h Wed Nov 10 17:43:15 2004 +@@ -54,5 +54,5 @@ + + // Get the error message, if there was one, for the last message +- virtual char *getErrorMsg() { return NULL; } ++ virtual const char *getErrorMsg() { return NULL; } + + // Virtual destructor +--- sql-manager.h Wed Jun 9 22:47:25 1999 ++++ sql-manager.h Wed Nov 10 17:55:13 2004 +@@ -13,5 +13,5 @@ + + // The last error message +- char *errmsg; ++ const char *errmsg; + + public: +@@ -26,5 +26,5 @@ + + // Get the error message, if there was one, for the last message +- char *getErrorMsg(); ++ const char *getErrorMsg(); + + }; +--- sql-manager.cc Wed Jun 9 22:50:23 1999 ++++ sql-manager.cc Wed Nov 10 18:07:41 2004 +@@ -28,5 +28,5 @@ + + // --------------------------------------------------------- +-char * ++const char * + Manager_sql::getErrorMsg() { + return errmsg; diff --git a/databases/tcl-Mysql/files/patch-real_connect b/databases/tcl-Mysql/files/patch-real_connect new file mode 100644 index 000000000000..9b966ac3cb79 --- /dev/null +++ b/databases/tcl-Mysql/files/patch-real_connect @@ -0,0 +1,12 @@ +--- sql-mysql.cc Wed Jan 12 20:50:03 2000 ++++ sql-mysql.cc Wed Nov 10 18:49:18 2004 +@@ -2,4 +2,9 @@ + #include "sql-mysql.h" + ++#ifdef HAVE_MYSQL_REAL_CONNECT ++# define mysql_connect(h, ho, us, pa) \ ++ mysql_real_connect(h, ho, us, pa, NULL, 0, NULL, 0) ++#endif ++ + // ------------------------------------------------------------- + Sql_mysql::Sql_mysql() { |