diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2005-02-25 16:25:33 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2005-02-25 16:25:33 +0000 |
| commit | f6d86f3ffe33dc8e7ec5f87e67d197016aefdd21 (patch) | |
| tree | adb7100ed8176cd661f6149f6ef5abb95345be5b /databases/tcl-Mysql/files | |
| parent | simplify. (diff) | |
Fix a crash, that affected users of modern versions of MySQL.
Reported and tested by: Yves Gurin <yvesguerin@yahoo.ca>
Notes
Notes:
svn path=/head/; revision=129774
Diffstat (limited to 'databases/tcl-Mysql/files')
| -rw-r--r-- | databases/tcl-Mysql/files/Makefile.bsd | 1 | ||||
| -rw-r--r-- | databases/tcl-Mysql/files/patch-real_connect | 19 |
2 files changed, 16 insertions, 4 deletions
diff --git a/databases/tcl-Mysql/files/Makefile.bsd b/databases/tcl-Mysql/files/Makefile.bsd index b8f4f14b1cf9..9ee4ba62e043 100644 --- a/databases/tcl-Mysql/files/Makefile.bsd +++ b/databases/tcl-Mysql/files/Makefile.bsd @@ -6,6 +6,7 @@ CC = ${CXX} # a hack to force linking with c++ SRCS = sql-mysql.cc sql.cc sql-manager.cc CXXFLAGS+= -I${LOCALBASE}/include/${TCL_VERSION} CXXFLAGS+= -I${LOCALBASE}/include/mysql +CXXFLAGS+= -O0 -g LDADD += -L${LOCALBASE}/lib -l${TCL_NODOT} LDADD += -L${LOCALBASE}/lib/mysql -lmysqlclient diff --git a/databases/tcl-Mysql/files/patch-real_connect b/databases/tcl-Mysql/files/patch-real_connect index 9b966ac3cb79..f70f1715ac5c 100644 --- a/databases/tcl-Mysql/files/patch-real_connect +++ b/databases/tcl-Mysql/files/patch-real_connect @@ -1,11 +1,22 @@ +Simulate the "old" mysql_connect() function -- the actual code +is adapted from MySQL's libmysql.c. + + -mi + --- sql-mysql.cc Wed Jan 12 20:50:03 2000 +++ sql-mysql.cc Wed Nov 10 18:49:18 2004 -@@ -2,4 +2,9 @@ +@@ -2,4 +2,15 @@ #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) ++#if defined(HAVE_MYSQL_REAL_CONNECT) && !defined(USE_OLD_FUNCTIONS) ++static MYSQL * STDCALL ++mysql_connect(MYSQL *mysql,const char *host, ++ const char *user, const char *passwd) ++{ ++ ++ mysql=mysql_init(mysql); ++ return mysql_real_connect(mysql, host, user, passwd, NULL, 0, NULL, 0); ++} +#endif + // ------------------------------------------------------------- |