[patch] Patch to build against mysql 4.1.3

tetex-2.0.2-mysql4.1.diff (text/plain), 1.62 KB, created by Simon Detheridge on 2004-07-07 10:09:41 UTC

diff --unified --recursive tetex-src-2.0.2.old/libs/libwww/HTSQL.c tetex-src-2.0.2/libs/libwww/HTSQL.c
--- tetex-src-2.0.2.old/libs/libwww/HTSQL.c	2004-07-07 16:17:27.864827048 +0100
+++ tetex-src-2.0.2/libs/libwww/HTSQL.c	2004-07-07 16:26:45.595039168 +0100
@@ -46,14 +46,13 @@
 #ifdef HAVE_STRFTIME
     	length = strftime(*ptr, 40, "\'%Y-%m-%d %H:%M:%S\'", pgmt);
 #else
-	sprintf(*ptr, "\'%04d-%02d-%02d %02d:%02d:%02d\'",
+	length = sprintf(*ptr, "\'%04d-%02d-%02d %02d:%02d:%02d\'",
 		pgmt->tm_year + 1900,
 		pgmt->tm_mon + 1,
 		pgmt->tm_wday + 1,
 		pgmt->tm_hour,
 		pgmt->tm_min,
 		pgmt->tm_sec);
-        length = strlen(*ptr);
 #endif  /* HAVE_STRFTIME */
 
 	/* Remove the  trailing zero */
@@ -183,9 +182,10 @@
 {
     if (me && me->host) {
 	HTTRACE(SQL_TRACE, "SQL connect. Open a link to server `%s\'\n" _ me->host);
-	if ((me->psvr = mysql_connect(&(me->server), me->host,
+	if ((me->psvr = mysql_real_connect(&(me->server), me->host,
 				      me->user ? me->user : "",
-				      me->password ? me->password : "")) == NULL) {
+				      me->password ? me->password : "",
+				      "",0,0,0)) == NULL) {
 	    HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ 
 			mysql_error(&me->server) _ mysql_errno(&me->server));
 	    return NO;
@@ -241,7 +241,9 @@
 
 	    /* If the database couldn't be found then create a new one */
 	    if (err == 1049) {
-		if (mysql_create_db(me->psvr, db) < 0) {
+	    	char query[1024];
+		sprintf (query, "CREATE DATABASE %s", db);
+		if (mysql_query(me->psvr, query) < 0) {
 		    HTTRACE(SQL_TRACE, "SQL error... `%s\', errno %d\n" _ 
 					   mysql_error(me->psvr) _ err);
 		    return NO;