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

Author: ahristov
Date: 2007-06-28 15:19:46 +0200 (Thu, 28 Jun 2007) New Revision: 569

Modified:

   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

Modified: trunk/mysqlnd/mysqlnd.h

• trunk/mysqlnd/mysqlnd.h 2007-06-28 12:54:05 UTC (rev 568) +++ trunk/mysqlnd/mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) @@ -790,6 +790,7 @@
  #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_processes(conn) ((conn)->m->query((conn), "SHOW PROCESSLIST", sizeof("SHOW PROCESSLIST")-1 TSRMLS_CC), mysqlnd_store_result((conn)))
  #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 12:54:05 UTC (rev 568) +++ trunk/php4/ext/mysql/mysql_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) @@ -63,6 +63,7 @@
  #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_processes(c) mysqlnd_list_processes((c))
  #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 12:54:05 UTC (rev 568) +++ trunk/php4/ext/mysql/php_mysql.c 2007-06-28 13:19:46 UTC (rev 569) @@ -141,8 +141,8 @@ PHP_FE(mysql_list_dbs, NULL) PHP_FE(mysql_list_tables, NULL) PHP_FE(mysql_list_fields, NULL) - PHP_FE(mysql_list_processes, NULL)
  #endif
  + PHP_FE(mysql_list_processes, NULL) PHP_FE(mysql_error, NULL)
  #ifdef HAVE_MYSQL_ERRNO
  PHP_FE(mysql_errno, NULL) @@ -1623,7 +1623,6 @@

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

         Returns a result set describing the current server threads */ -#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_processes)
 {

         zval *mysql_link = NULL;
@@ -1652,7 +1651,6 @@  

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

         ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);  }
-#endif
 /* }}} */    

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

• trunk/php5/ext/mysql/mysql_mysqlnd.h 2007-06-28 12:54:05 UTC (rev 568) +++ trunk/php5/ext/mysql/mysql_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) @@ -63,6 +63,7 @@
  #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_processes(c) mysqlnd_list_processes((c))
  #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 12:54:05 UTC (rev 568) +++ trunk/php5/ext/mysql/php_mysql.c 2007-06-28 13:19:46 UTC (rev 569) @@ -148,8 +148,8 @@ PHP_FE(mysql_list_dbs, NULL) PHP_DEP_FE(mysql_list_tables, NULL) PHP_FE(mysql_list_fields, NULL) - PHP_FE(mysql_list_processes, NULL)
  #endif
  + PHP_FE(mysql_list_processes, NULL) PHP_FE(mysql_error, NULL)
  #ifdef HAVE_MYSQL_ERRNO
  PHP_FE(mysql_errno, NULL) @@ -1552,7 +1552,6 @@

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

         Returns a result set describing the current server threads */ -#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_processes)
 {

         zval *mysql_link = NULL;
@@ -1581,7 +1580,6 @@  

         ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);  }
-#endif
 /* }}} */    

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

• trunk/php5/ext/mysqli/mysqli_mysqlnd.h 2007-06-28 12:54:05 UTC (rev 568) +++ trunk/php5/ext/mysqli/mysqli_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) @@ -63,6 +63,7 @@
  #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_processes(c) mysqlnd_list_processes((c))
  #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))
  

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

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

• trunk/php6/ext/mysql/mysql_mysqlnd.h 2007-06-28 12:54:05 UTC (rev 568) +++ trunk/php6/ext/mysql/mysql_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) @@ -63,6 +63,7 @@
  #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_processes(c) mysqlnd_list_processes((c))
  #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 12:54:05 UTC (rev 568) +++ trunk/php6/ext/mysql/php_mysql.c 2007-06-28 13:19:46 UTC (rev 569) @@ -142,8 +142,8 @@ PHP_FE(mysql_list_dbs, NULL) PHP_DEP_FE(mysql_list_tables, NULL) PHP_FE(mysql_list_fields, NULL) - PHP_FE(mysql_list_processes, NULL)
  #endif
  + PHP_FE(mysql_list_processes, NULL) PHP_FE(mysql_error, NULL)
  #ifdef HAVE_MYSQL_ERRNO
  PHP_FE(mysql_errno, NULL) @@ -1526,7 +1526,6 @@

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

         Returns a result set describing the current server threads */ -#ifndef HAVE_MYSQLND
 PHP_FUNCTION(mysql_list_processes)
 {

         zval *mysql_link = NULL;
@@ -1555,7 +1554,6 @@  

         ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);  }
-#endif
 /* }}} */    

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

• trunk/php6/ext/mysqli/mysqli_mysqlnd.h 2007-06-28 12:54:05 UTC (rev 568) +++ trunk/php6/ext/mysqli/mysqli_mysqlnd.h 2007-06-28 13:19:46 UTC (rev 569) @@ -60,6 +60,7 @@
  #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_processes(c) mysqlnd_list_processes((c))
  #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