PHP mysqlnd svn commit: r576 - trunk/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-06-28 17:33:13 +0200 (Thu, 28 Jun 2007)
New Revision: 576

Modified:
   trunk/mysqlnd/mysqlnd.c
   trunk/mysqlnd/mysqlnd.h
Log:
Fix crash in list_dbs. Well, the mistake was stupidd!!


Modified: trunk/mysqlnd/mysqlnd.c
===================================================================
--- trunk/mysqlnd/mysqlnd.c	2007-06-28 15:15:43 UTC (rev 575)
+++ trunk/mysqlnd/mysqlnd.c	2007-06-28 15:33:13 UTC (rev 576)
@@ -671,21 +671,21 @@
 
 /* {{{ mysqlnd_conn::list_method */
 MYSQLND_RES *
-MYSQLND_METHOD(mysqlnd_conn, list_method)(MYSQLND *conn, const char *query, char *wild,
char *par1 TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, list_method)(MYSQLND *conn, const char *query, char
*achtung_wild, char *par1 TSRMLS_DC)
 {
 	char *show_query = NULL;
 	size_t show_query_len;
 	MYSQLND_RES *result = NULL;
 
 	if (par1) {
-		if (wild) {
-			show_query_len = spprintf(&show_query, 0, query, par1, wild);
+		if (achtung_wild) {
+			show_query_len = spprintf(&show_query, 0, query, par1, achtung_wild);
 		} else {
 			show_query_len = spprintf(&show_query, 0, query, par1);	
 		}
 	} else {
-		if (wild) {
-			show_query_len = spprintf(&show_query, 0, query, wild);
+		if (achtung_wild) {
+			show_query_len = spprintf(&show_query, 0, query, achtung_wild);
 		} else {
 			show_query_len = strlen(show_query = (char *)query);	
 		}	

Modified: trunk/mysqlnd/mysqlnd.h
===================================================================
--- trunk/mysqlnd/mysqlnd.h	2007-06-28 15:15:43 UTC (rev 575)
+++ trunk/mysqlnd/mysqlnd.h	2007-06-28 15:33:13 UTC (rev 576)
@@ -347,7 +347,7 @@
 	unsigned int		(*get_protocol_information)(const MYSQLND * const conn);
 	const char *		(*get_last_message)(const MYSQLND * const conn);
 	const char *		(*charset_name)(const MYSQLND * const conn);
-	MYSQLND_RES *		(*list_method)(MYSQLND *conn, const char *query, char *wild, char *par1
TSRMLS_DC);
+	MYSQLND_RES *		(*list_method)(MYSQLND *conn, const char *query, char *achtung_wild, char
*par1 TSRMLS_DC);
 
 	mynd_ulonglong		(*get_last_insert_id)(const MYSQLND * const conn);
 	mynd_ulonglong		(*get_affected_rows)(const MYSQLND * const conn);
@@ -791,10 +791,10 @@
 #define mysqlnd_autocommit(conn, mode)		(conn)->m->query((conn),(mode) ? "SET
AUTOCOMMIT=1":"SET AUTOCOMMIT=0", 16 TSRMLS_CC)
 #define mysqlnd_commit(conn)				(conn)->m->query((conn), "COMMIT",
sizeof("COMMIT")-1 TSRMLS_CC)
 #define mysqlnd_rollback(conn)				(conn)->m->query((conn), "ROLLBACK",
sizeof("ROLLBACK")-1 TSRMLS_CC)
-#define mysqlnd_list_dbs(conn, wild)		(conn)->m->list_method((conn), wild? "SHOW
DATABASES":"SHOW DATABASES LIKE %s", (wild), NULL TSRMLS_CC)
-#define mysqlnd_list_fields(conn, tab,wild)	(conn)->m->list_method((conn), wild?
"SHOW FIELDS FROM %s":"SHOW FIELDS FROM %s LIKE %s", wild, tab TSRMLS_CC)
+#define mysqlnd_list_dbs(conn, wild)		(conn)->m->list_method((conn), wild? "SHOW
DATABASES LIKE %s":"SHOW DATABASES", (wild), NULL TSRMLS_CC)
+#define mysqlnd_list_fields(conn, tab,wild)	(conn)->m->list_method((conn), wild?
"SHOW FIELDS FROM %s LIKE %s":"SHOW FIELDS FROM %s", wild, tab TSRMLS_CC)
 #define mysqlnd_list_processes(conn)		(conn)->m->list_method((conn), "SHOW
PROCESSLIST", NULL, NULL TSRMLS_CC)
-#define mysqlnd_list_tables(conn, wild)		(conn)->m->list_method((conn), wild? "SHOW
TABLES":"SHOW TABLES LIKE %s", (wild), NULL TSRMLS_CC)
+#define mysqlnd_list_tables(conn, wild)		(conn)->m->list_method((conn), wild? "SHOW
TABLES LIKE %s":"SHOW TABLES", (wild), NULL TSRMLS_CC)
 #define
mysqlnd_dump_debug_info(conn)		(conn)->m->server_dump_debug_information((conn)
TSRMLS_CC)
 #define mysqlnd_select_db(conn, db, db_len)	(conn)->m->select_db((conn), (db),
(db_len) TSRMLS_CC)
 #define mysqlnd_ping(conn)					(conn)->m->ping((conn) TSRMLS_CC)