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

Author: ahristov
Date: 2007-10-01 20:11:19 +0200 (Mon, 01 Oct 2007) New Revision: 1076

Modified:

   trunk/php4/ext/mysql/php_mysql.c
   trunk/php5/ext/mysql/php_mysql.c
   trunk/php5/ext/mysqli/mysqli.c
   trunk/php6/ext/mysql/php_mysql.c
   trunk/php6/ext/mysqli/config.m4
   trunk/php6/ext/mysqli/mysqli.c
   trunk/php6/ext/mysqli/php_mysqli_structs.h

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

• trunk/php4/ext/mysql/php_mysql.c 2007-10-01 17:35:08 UTC (rev 1075) +++ trunk/php4/ext/mysql/php_mysql.c 2007-10-01 18:11:19 UTC (rev 1076)
  @@ -474,7 +474,8 @@
  */ PHP_MSHUTDOWN_FUNCTION(mysql) { -#if !defined(HAVE_MYSQLND) && MYSQL_VERSION_ID >= 40000 +#if !defined(HAVE_MYSQLND) +#if MYSQL_VERSION_ID >= 40000 #ifdef PHP_WIN32 unsigned long client_ver = mysql_get_client_version(); /*
  @@ -488,6 +489,7 @@
  mysql_server_end(); #endif #endif +#endif

 #ifdef HAVE_MYSQLND

         mysqlnd_palloc_free_cache(mysql_mysqlnd_zval_cache);

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

• trunk/php5/ext/mysql/php_mysql.c 2007-10-01 17:35:08 UTC (rev 1075) +++ trunk/php5/ext/mysql/php_mysql.c 2007-10-01 18:11:19 UTC (rev 1076)
  @@ -469,6 +469,7 @@
  PHP_MSHUTDOWN_FUNCTION(mysql) { #ifndef HAVE_MYSQLND +#if MYSQL_VERSION_ID >= 40000 #ifdef PHP_WIN32 unsigned long client_ver = mysql_get_client_version(); /*
  @@ -481,6 +482,7 @@
  #else mysql_server_end(); #endif +#endif #else mysqlnd_palloc_free_cache(mysql_mysqlnd_zval_cache); mysqlnd_qcache_free_cache_reference(&mysql_mysqlnd_qcache);

Modified: trunk/php5/ext/mysqli/mysqli.c

• trunk/php5/ext/mysqli/mysqli.c 2007-10-01 17:35:08 UTC (rev 1075) +++ trunk/php5/ext/mysqli/mysqli.c 2007-10-01 18:11:19 UTC (rev 1076)
  @@ -792,6 +792,7 @@
  PHP_MSHUTDOWN_FUNCTION(mysqli) { #ifndef HAVE_MYSQLND +#if MYSQL_VERSION_ID >= 40000 #ifdef PHP_WIN32 unsigned long client_ver = mysql_get_client_version(); /*
  @@ -804,6 +805,7 @@
  #else mysql_server_end(); #endif +#endif #else mysqlnd_palloc_free_cache(mysqli_mysqlnd_zval_cache); mysqlnd_qcache_free_cache_reference(&mysqli_mysqlnd_qcache);

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

• trunk/php6/ext/mysql/php_mysql.c 2007-10-01 17:35:08 UTC (rev 1075) +++ trunk/php6/ext/mysql/php_mysql.c 2007-10-01 18:11:19 UTC (rev 1076)
  @@ -1,6 +1,6 @@
  /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 6 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2007 The PHP Group | +----------------------------------------------------------------------+
  @@ -466,6 +466,7 @@
  PHP_MSHUTDOWN_FUNCTION(mysql) { #ifndef HAVE_MYSQLND +#if MYSQL_VERSION_ID >= 40000 #ifdef PHP_WIN32 unsigned long client_ver = mysql_get_client_version(); /*
  @@ -478,6 +479,7 @@
  #else mysql_server_end(); #endif +#endif #else mysqlnd_palloc_free_cache(mysql_mysqlnd_zval_cache); mysqlnd_qcache_free_cache_reference(&mysql_mysqlnd_qcache);

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

Modified: trunk/php6/ext/mysqli/config.m4

• trunk/php6/ext/mysqli/config.m4 2007-10-01 17:35:08 UTC (rev 1075) +++ trunk/php6/ext/mysqli/config.m4 2007-10-01 18:11:19 UTC (rev 1076)
  @@ -1,13 +1,15 @@
  dnl -dnl $Id: config.m4,v 1.28 2007/07/25 23:47:32 jani Exp $ +dnl $Id: config.m4,v 1.29 2007/07/27 01:09:18 jani Exp $ dnl config.m4 for extension mysqli

 PHP_ARG_WITH(mysqli, for MySQLi support, -[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname to mysql_config [mysql_config].

-                          If mysqlnd is passed as FILE, the MySQL native driver will be used])
+[  --with-mysqli[=FILE]    Include MySQLi support.  FILE is the path
+                          to mysql_config.  If mysqlnd is passed as FILE,
+                          the MySQL native driver will be used [mysql_config]])
 

 PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, -[ --enable-embedded-mysqli MYSQLi: Enable embedded support], no, no) +[ --enable-embedded-mysqli MYSQLi: Enable embedded support

+                            Note: Does not work with MySQL native driver!], no, no)
 

 if test "$PHP_MYSQLI" = "mysqlnd"; then    dnl This needs to be set in any extension which wishes to use mysqlnd

Modified: trunk/php6/ext/mysqli/mysqli.c

• trunk/php6/ext/mysqli/mysqli.c 2007-10-01 17:35:08 UTC (rev 1075) +++ trunk/php6/ext/mysqli/mysqli.c 2007-10-01 18:11:19 UTC (rev 1076)
  @@ -798,6 +798,7 @@
  PHP_MSHUTDOWN_FUNCTION(mysqli) { #ifndef HAVE_MYSQLND +#if MYSQL_VERSION_ID >= 40000 #ifdef PHP_WIN32 unsigned long client_ver = mysql_get_client_version(); /*
  @@ -810,6 +811,7 @@
  #else mysql_server_end(); #endif +#endif #else mysqlnd_palloc_free_cache(mysqli_mysqlnd_zval_cache); mysqlnd_qcache_free_cache_reference(&mysqli_mysqlnd_qcache);

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

• trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-10-01 17:35:08 UTC (rev 1075) +++ trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-10-01 18:11:19 UTC (rev 1076)
  @@ -1,6 +1,6 @@
  /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 6 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2007 The PHP Group | +----------------------------------------------------------------------+

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