svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_prop.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/mysqli/mysqli_prop.c
trunk/ext/mysqli/mysqli_prop.c
| From: | Johannes Schlüter | Date: | Tue, 06 Mar 2012 00:15:40 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_prop.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/mysqli/mysqli_prop.c trunk/ext/mysqli/mysqli_prop.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67840@lists.php.net to get a copy of this message | ||
johannes Tue, 06 Mar 2012 00:15:40 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323931
Log:
Fix bug #61003 mysql_stat() require a valid connection
Bug: https://bugs.php.net/61003 (Assigned) mysql_stat()
require a valid connection
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_prop.c
U php/php-src/trunk/ext/mysqli/mysqli_prop.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2012-03-05 23:57:24 UTC (rev 323930)
+++ php/php-src/branches/PHP_5_3/NEWS 2012-03-06 00:15:40 UTC (rev 323931)
@@ -36,6 +36,9 @@
- Firebird Database extension (ibase):
. Fixed bug #60802 (ibase_trans() gives segfault when passing params).
+- mysqli
+ . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
+
- PDO_mysql
. Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
always work). (Johannes)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c 2012-03-05 23:57:24 UTC (rev 323930)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c 2012-03-06 00:15:40 UTC (rev 323931)
@@ -211,7 +211,11 @@
MAKE_STD_ZVAL(*retval);
ZVAL_NULL(*retval);
+#if defined(MYSQLI_USE_MYSQLND)
CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+#else
+ CHECK_STATUS(MYSQLI_STATUS_VALID);
+#endif
mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-05 23:57:24 UTC (rev 323930)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-06 00:15:40 UTC (rev 323931)
@@ -38,6 +38,9 @@
- mbstring:
. MFH mb_ereg_replace_callback() for security enhancements. (Rui)
+- mysqli
+ . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
+
- mysqlnd
. Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
(Johannes)
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_prop.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_prop.c 2012-03-05 23:57:24 UTC (rev 323930)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_prop.c 2012-03-06 00:15:40 UTC (rev 323931)
@@ -260,7 +260,11 @@
MAKE_STD_ZVAL(*retval);
ZVAL_NULL(*retval);
+#if defined(MYSQLI_USE_MYSQLND)
CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+#else
+ CHECK_STATUS(MYSQLI_STATUS_VALID);
+#endif
mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
Modified: php/php-src/trunk/ext/mysqli/mysqli_prop.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_prop.c 2012-03-05 23:57:24 UTC (rev 323930)
+++ php/php-src/trunk/ext/mysqli/mysqli_prop.c 2012-03-06 00:15:40 UTC (rev 323931)
@@ -260,7 +260,11 @@
MAKE_STD_ZVAL(*retval);
ZVAL_NULL(*retval);
+#if defined(MYSQLI_USE_MYSQLND)
CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+#else
+ CHECK_STATUS(MYSQLI_STATUS_VALID);
+#endif
mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;