PHP mysqlnd svn commit: r570 - in trunk: mysqlnd php4/ext/mysql php5/ext/mysql php5/ext/mysqli php6/ext/mysql php6/ext/mysqli

From: <ahristov(at)mysql.com>
Date: Thu Jun 28 2007 - 10:05:23 EDT

Author: ahristov
Date: 2007-06-28 16:05:22 +0200 (Thu, 28 Jun 2007) New Revision: 570

Modified:

   trunk/mysqlnd/mysqlnd.c
   trunk/mysqlnd/mysqlnd.h
   trunk/php4/ext/mysql/mysql_mysqlnd.h
   trunk/php4/ext/mysql/php_mysql.c
   trunk/php5/ext/mysql/mysql_mysqlnd.h
   trunk/php5/ext/mysql/php_mysql.c
   trunk/php5/ext/mysqli/mysqli_mysqlnd.h
   trunk/php6/ext/mysql/mysql_mysqlnd.h
   trunk/php6/ext/mysql/php_mysql.c
   trunk/php6/ext/mysqli/mysqli_mysqlnd.h

Log:

- _list_processes()
- _list_tables()
- _list_fields()
- _list_dbs()

Modified: trunk/mysqlnd/mysqlnd.c

---

• trunk/mysqlnd/mysqlnd.c 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/mysqlnd/mysqlnd.c 2007-06-28 14:05:22 UTC (rev 570)
  @@ -668,6 +668,37 @@
  /* }}} */

+
+/* {{{ mysqlnd_conn::list_method */
+MYSQLND_RES *
+MYSQLND_METHOD(mysqlnd_conn, list_method)(MYSQLND *conn, const char *query, char *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);
+		} else {
+			show_query_len = spprintf(&show_query, 0, query, par1);	
+		}
+	} else {
+		if (wild) {
+			show_query_len = spprintf(&show_query, 0, query, wild);
+		} else {
+			show_query_len = spprintf(&show_query, 0, query);	
+		}	
+	}
+
+	if (PASS == conn->m->query(conn, show_query, show_query_len TSRMLS_CC)) {
+		efree(show_query);
+		result = conn->m->store_result(conn TSRMLS_CC);
+	} 
+	return result;
+}
+/* }}} */
+

 /* {{{ mysqlnd_conn::errno */
 static unsigned int
 MYSQLND_METHOD(mysqlnd_conn, errno)(const MYSQLND * const conn)
@@ -1429,6 +1460,7 @@

 	MYSQLND_METHOD(mysqlnd_conn, get_proto_info),
 	MYSQLND_METHOD(mysqlnd_conn, info),
 	MYSQLND_METHOD(mysqlnd_conn, charset_name),
+	MYSQLND_METHOD(mysqlnd_conn, list_method),
 
 	MYSQLND_METHOD(mysqlnd_conn, insert_id),
 	MYSQLND_METHOD(mysqlnd_conn, affected_rows),

Modified: trunk/mysqlnd/mysqlnd.h

---

• trunk/mysqlnd/mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/mysqlnd/mysqlnd.h 2007-06-28 14:05:22 UTC (rev 570)
  @@ -347,6 +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);

 	mynd_ulonglong		(*get_last_insert_id)(const MYSQLND * const conn);
 	mynd_ulonglong		(*get_affected_rows)(const MYSQLND * const conn);

@@ -790,7 +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)
Do you need help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 #define mysqlnd_rollback(conn)				(conn)->m->query((conn), "ROLLBACK", sizeof("ROLLBACK")-1 TSRMLS_CC)
-#define mysqlnd_list_processes(conn)		((conn)->m->query((conn), "SHOW PROCESSLIST", sizeof("SHOW PROCESSLIST")-1 TSRMLS_CC), mysqlnd_store_result((conn)))
+#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_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_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)

Modified: trunk/php4/ext/mysql/mysql_mysqlnd.h

---

• trunk/php4/ext/mysql/mysql_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/php4/ext/mysql/mysql_mysqlnd.h 2007-06-28 14:05:22 UTC (rev 570)
  @@ -63,7 +63,10 @@
  #define mysql_init(a) mysqlnd_init((a)) #define mysql_insert_id(r) mysqlnd_insert_id((r)) #define mysql_kill(r,n) mysqlnd_kill((r), (n)) +#define mysql_list_dbs(c, wild) mysqlnd_list_dbs((c), (wild)) +#define mysql_list_fields(c, tab, wild) mysqlnd_list_fields((c), (tab), (wild)) #define mysql_list_processes(c) mysqlnd_list_processes((c)) +#define mysql_list_tables(c, wild) mysqlnd_list_tables((c), (wild)) #define mysql_more_results(r) mysqlnd_more_results((r)) #define mysql_next_result(r) mysqlnd_next_result((r)) #define mysql_num_fields(r) mysqlnd_num_fields((r))

Modified: trunk/php4/ext/mysql/php_mysql.c

---

• trunk/php4/ext/mysql/php_mysql.c 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/php4/ext/mysql/php_mysql.c 2007-06-28 14:05:22 UTC (rev 570)
  @@ -74,7 +74,7 @@
  

 #define SAFE_STRING(s) ((s)?(s):"")  

-#if MYSQL_VERSION_ID > 32199
+#if MYSQL_VERSION_ID > 32199 || defined(HAVE_MYSQLND)
 # define mysql_row_length_type unsigned long
 # define HAVE_MYSQL_ERRNO
 #else

@@ -84,7 +84,7 @@

 # endif
 #endif  

-#if MYSQL_VERSION_ID >= 32032
+#if MYSQL_VERSION_ID >= 32032 || defined(HAVE_MYSQLND)
 #define HAVE_GETINFO_FUNCS
 #endif
 

@@ -137,11 +137,9 @@

 	PHP_FE(mysql_query,									NULL)
 	PHP_FE(mysql_unbuffered_query,						NULL)
 	PHP_FE(mysql_db_query,								NULL)
-#ifndef HAVE_MYSQLND
 	PHP_FE(mysql_list_dbs,								NULL)
 	PHP_FE(mysql_list_tables,							NULL)
 	PHP_FE(mysql_list_fields,							NULL)
-#endif
 	PHP_FE(mysql_list_processes,						NULL)
 	PHP_FE(mysql_error,									NULL)
Do you need more help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek

 #ifdef HAVE_MYSQL_ERRNO
@@ -202,10 +200,10 @@

 	PHP_FALIAS(mysql_freeresult,	mysql_free_result,	NULL)
 	PHP_FALIAS(mysql_numfields,		mysql_num_fields,	NULL)
 	PHP_FALIAS(mysql_numrows,		mysql_num_rows,		NULL)
-#ifndef HAVE_MYSQLND
 	PHP_FALIAS(mysql_listdbs,		mysql_list_dbs,		NULL)
 	PHP_FALIAS(mysql_listtables,	mysql_list_tables,	NULL)
 	PHP_FALIAS(mysql_listfields,	mysql_list_fields,	NULL)
+#ifndef HAVE_MYSQLND
 	PHP_FALIAS(mysql_db_name,		mysql_result,		NULL)
 	PHP_FALIAS(mysql_dbname,		mysql_result,		NULL)
 	PHP_FALIAS(mysql_tablename,		mysql_result,		NULL)

@@ -1527,7 +1525,6 @@
 

 /* {{{ proto resource mysql_list_tables(string database_name [, int link_identifier])

    List tables in a MySQL database */
-#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_tables)
 {

         zval **db, **mysql_link;
@@ -1569,13 +1566,11 @@

 	}
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);

 }
-#endif
 /* }}} */    

 /* {{{ proto resource mysql_list_fields(string database_name, string table_name [, int link_identifier])

    List MySQL result fields */
-#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_fields)
 {

         zval **db, **table, **mysql_link;
@@ -1618,7 +1613,6 @@

 	}
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);

 }
-#endif
 /* }}} */  

 /* {{{ proto resource mysql_list_processes([int link_identifier])

Modified: trunk/php5/ext/mysql/mysql_mysqlnd.h

---

• trunk/php5/ext/mysql/mysql_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/php5/ext/mysql/mysql_mysqlnd.h 2007-06-28 14:05:22 UTC (rev 570)
  @@ -63,7 +63,10 @@
  #define mysql_init(a) mysqlnd_init((a)) #define mysql_insert_id(r) mysqlnd_insert_id((r)) #define mysql_kill(r,n) mysqlnd_kill((r), (n)) +#define mysql_list_dbs(c, wild) mysqlnd_list_dbs((c), (wild)) +#define mysql_list_fields(c, tab, wild) mysqlnd_list_fields((c), (tab), (wild)) #define mysql_list_processes(c) mysqlnd_list_processes((c)) +#define mysql_list_tables(c, wild) mysqlnd_list_tables((c), (wild)) #define mysql_more_results(r) mysqlnd_more_results((r)) #define mysql_next_result(r) mysqlnd_next_result((r)) #define mysql_num_fields(r) mysqlnd_num_fields((r))

Modified: trunk/php5/ext/mysql/php_mysql.c

---

• trunk/php5/ext/mysql/php_mysql.c 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/php5/ext/mysql/php_mysql.c 2007-06-28 14:05:22 UTC (rev 570)
  @@ -78,7 +78,7 @@
  

 #define SAFE_STRING(s) ((s)?(s):"")  

-#if MYSQL_VERSION_ID > 32199
+#if MYSQL_VERSION_ID > 32199 || defined(HAVE_MYSQLND)
 # define mysql_row_length_type unsigned long
 # define HAVE_MYSQL_ERRNO
 #else

@@ -88,7 +88,7 @@

 # endif
 #endif  

-#if MYSQL_VERSION_ID >= 32032
+#if MYSQL_VERSION_ID >= 32032 || defined(HAVE_MYSQLND)
 #define HAVE_GETINFO_FUNCS
 #endif
 

@@ -144,11 +144,9 @@

 	PHP_FE(mysql_query,									NULL)
 	PHP_FE(mysql_unbuffered_query,						NULL)
 	PHP_FE(mysql_db_query,								NULL)
-#ifndef HAVE_MYSQLND
 	PHP_FE(mysql_list_dbs,								NULL)
 	PHP_DEP_FE(mysql_list_tables,						NULL)
 	PHP_FE(mysql_list_fields,							NULL)
-#endif
 	PHP_FE(mysql_list_processes,						NULL)
 	PHP_FE(mysql_error,									NULL)

 #ifdef HAVE_MYSQL_ERRNO
@@ -209,10 +207,10 @@

 	PHP_FALIAS(mysql_freeresult,	mysql_free_result,	NULL)
 	PHP_FALIAS(mysql_numfields,		mysql_num_fields,	NULL)
 	PHP_FALIAS(mysql_numrows,		mysql_num_rows,		NULL)
-#ifndef HAVE_MYSQLND
 	PHP_FALIAS(mysql_listdbs,		mysql_list_dbs,		NULL)
 	PHP_DEP_FALIAS(mysql_listtables,mysql_list_tables,	NULL)
 	PHP_FALIAS(mysql_listfields,	mysql_list_fields,	NULL)
+#ifndef HAVE_MYSQLND
 	PHP_FALIAS(mysql_db_name,		mysql_result,		NULL)
 	PHP_FALIAS(mysql_dbname,		mysql_result,		NULL)
Don't know where to look next?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 	PHP_FALIAS(mysql_tablename,		mysql_result,		NULL)

@@ -1417,7 +1415,6 @@
 

 /* {{{ proto resource mysql_list_dbs([int link_identifier])

    List databases available on a MySQL server */ -#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_dbs)
 {

         zval **mysql_link;
@@ -1451,13 +1448,11 @@

 	}
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);

 }
-#endif
 /* }}} */    

 /* {{{ proto resource mysql_list_tables(string database_name [, int link_identifier])

    List tables in a MySQL database */
-#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_tables)
 {

         zval **db, **mysql_link;
@@ -1498,13 +1493,11 @@

 	}
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);

 }
-#endif
 /* }}} */    

 /* {{{ proto resource mysql_list_fields(string database_name, string table_name [, int link_identifier])

    List MySQL result fields */
-#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_fields)
 {

         zval **db, **table, **mysql_link;
@@ -1547,7 +1540,6 @@

 	}
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);

 }
-#endif
 /* }}} */  

 /* {{{ proto resource mysql_list_processes([int link_identifier])

Modified: trunk/php5/ext/mysqli/mysqli_mysqlnd.h

---

• trunk/php5/ext/mysqli/mysqli_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/php5/ext/mysqli/mysqli_mysqlnd.h 2007-06-28 14:05:22 UTC (rev 570)
  @@ -63,7 +63,10 @@
  #define mysql_init(a) mysqlnd_init((a)) #define mysql_insert_id(r) mysqlnd_insert_id((r)) #define mysql_kill(r,n) mysqlnd_kill((r), (n)) +#define mysql_list_dbs(c, wild) mysqlnd_list_dbs((c), (wild)) +#define mysql_list_fields(c, tab, wild) mysqlnd_list_fields((c), (tab), (wild)) #define mysql_list_processes(c) mysqlnd_list_processes((c)) +#define mysql_list_tables(c, wild) mysqlnd_list_tables((c), (wild)) #define mysql_more_results(r) mysqlnd_more_results((r)) #define mysql_next_result(r) mysqlnd_next_result((r)) #define mysql_num_fields(r) mysqlnd_num_fields((r))

Modified: trunk/php6/ext/mysql/mysql_mysqlnd.h

---

• trunk/php6/ext/mysql/mysql_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/php6/ext/mysql/mysql_mysqlnd.h 2007-06-28 14:05:22 UTC (rev 570)
  @@ -63,7 +63,10 @@
  #define mysql_init(a) mysqlnd_init((a)) #define mysql_insert_id(r) mysqlnd_insert_id((r)) #define mysql_kill(r,n) mysqlnd_kill((r), (n)) +#define mysql_list_dbs(c, wild) mysqlnd_list_dbs((c), (wild)) +#define mysql_list_fields(c, tab, wild) mysqlnd_list_fields((c), (tab), (wild)) #define mysql_list_processes(c) mysqlnd_list_processes((c)) +#define mysql_list_tables(c, wild) mysqlnd_list_tables((c), (wild)) #define mysql_more_results(r) mysqlnd_more_results((r)) #define mysql_next_result(r) mysqlnd_next_result((r)) #define mysql_num_fields(r) mysqlnd_num_fields((r))

Modified: trunk/php6/ext/mysql/php_mysql.c

---

• trunk/php6/ext/mysql/php_mysql.c 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/php6/ext/mysql/php_mysql.c 2007-06-28 14:05:22 UTC (rev 570)
  @@ -72,7 +72,7 @@
  

 #define SAFE_STRING(s) ((s)?(s):"")  

-#if MYSQL_VERSION_ID > 32199
+#if MYSQL_VERSION_ID > 32199 || defined(HAVE_MYSQLND)
 # define mysql_row_length_type unsigned long
 # define HAVE_MYSQL_ERRNO
 #else

@@ -82,7 +82,7 @@

 # endif
 #endif  

-#if MYSQL_VERSION_ID >= 32032
+#if MYSQL_VERSION_ID >= 32032 || defined(HAVE_MYSQLND)
 #define HAVE_GETINFO_FUNCS
 #endif
 

@@ -138,11 +138,9 @@

 	PHP_FE(mysql_query,									NULL)
 	PHP_FE(mysql_unbuffered_query,						NULL)
 	PHP_FE(mysql_db_query,								NULL)
-#ifndef HAVE_MYSQLND
 	PHP_FE(mysql_list_dbs,								NULL)
 	PHP_DEP_FE(mysql_list_tables,						NULL)
 	PHP_FE(mysql_list_fields,							NULL)
-#endif
 	PHP_FE(mysql_list_processes,						NULL)
 	PHP_FE(mysql_error,									NULL)

 #ifdef HAVE_MYSQL_ERRNO
@@ -205,10 +203,10 @@

 	PHP_FALIAS(mysql_freeresult,	mysql_free_result,	NULL)
 	PHP_FALIAS(mysql_numfields,		mysql_num_fields,	NULL)
 	PHP_FALIAS(mysql_numrows,		mysql_num_rows,		NULL)
-#ifndef HAVE_MYSQLND
 	PHP_FALIAS(mysql_listdbs,		mysql_list_dbs,		NULL)
 	PHP_DEP_FALIAS(mysql_listtables,mysql_list_tables,	NULL)
 	PHP_FALIAS(mysql_listfields,	mysql_list_fields,	NULL)
+#ifndef HAVE_MYSQLND
 	PHP_FALIAS(mysql_db_name,		mysql_result,		NULL)
 	PHP_FALIAS(mysql_dbname,		mysql_result,		NULL)
 	PHP_FALIAS(mysql_tablename,		mysql_result,		NULL)

@@ -1412,7 +1410,6 @@
 

 /* {{{ proto resource mysql_list_dbs([int link_identifier]) U

    List databases available on a MySQL server */ -#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_dbs)
 {

         zval **mysql_link;
@@ -1446,13 +1443,11 @@

 	}
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);

 }
-#endif
 /* }}} */    

 /* {{{ proto resource mysql_list_tables(string database_name [, int link_identifier]) U

    List tables in a MySQL database */
-#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_tables)
 {

         zval *mysql_link;
@@ -1483,13 +1478,11 @@

 	}
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);

 }
-#endif
 /* }}} */    

 /* {{{ proto resource mysql_list_fields(string database_name, string table_name [, int link_identifier]) U

    List MySQL result fields */
-#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_fields)
 {

         zval *mysql_link;
@@ -1521,7 +1514,6 @@

 	}
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);

 }
-#endif
 /* }}} */  

 /* {{{ proto resource mysql_list_processes([int link_identifier]) U

Modified: trunk/php6/ext/mysqli/mysqli_mysqlnd.h

---

• trunk/php6/ext/mysqli/mysqli_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) +++ trunk/php6/ext/mysqli/mysqli_mysqlnd.h 2007-06-28 14:05:22 UTC (rev 570)
  @@ -60,7 +60,10 @@
  #define mysql_init(a) mysqlnd_init((a)) #define mysql_insert_id(r) mysqlnd_insert_id((r)) #define mysql_kill(r,n) mysqlnd_kill((r), (n)) +#define mysql_list_dbs(c, wild) mysqlnd_list_dbs((c), (wild)) +#define mysql_list_fields(c, tab, wild) mysqlnd_list_fields((c), (tab), (wild)) #define mysql_list_processes(c) mysqlnd_list_processes((c)) +#define mysql_list_tables(c, wild) mysqlnd_list_tables((c), (wild)) #define mysql_more_results(r) mysqlnd_more_results((r)) #define mysql_next_result(r) mysqlnd_next_result((r)) #define mysql_num_fields(r) mysqlnd_num_fields((r))

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Thu Jun 28 10:05:32 2007