cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd.c
| From: | Andrey Hristov | Date: | Tue, 18 Nov 2008 18:02:44 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54307@lists.php.net to get a copy of this message | ||
andrey Tue Nov 18 18:02:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlnd mysqlnd.c
Log:
MFH: Fix Windows build, pure C compiler
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.32&r2=1.5.2.33&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.32 php-src/ext/mysqlnd/mysqlnd.c:1.5.2.33
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.32 Tue Nov 18 17:02:18 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Nov 18 18:02:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.c,v 1.5.2.32 2008/11/18 17:02:18 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.33 2008/11/18 18:02:44 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -890,9 +890,10 @@
static enum_func_status
MYSQLND_METHOD(mysqlnd_conn, reap_query)(MYSQLND * conn TSRMLS_DC)
{
+ enum_mysqlnd_connection_state state = CONN_GET_STATE(conn);
DBG_ENTER("mysqlnd_conn::reap_query");
DBG_INF_FMT("conn=%llu", conn->thread_id);
- enum_mysqlnd_connection_state state = CONN_GET_STATE(conn);
+
if (state <= CONN_READY || state == CONN_QUIT_SENT) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not opened, clear or has been
closed");
DBG_RETURN(FAIL);