andrey Tue Jul 15 13:11:09 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlnd mysqlnd.c mysqlnd_palloc.c mysqlnd_ps.c
mysqlnd_wireprotocol.c
Log:
Sync with bzr
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.20&r2=1.213.2.6.2.16.2.21&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.20
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.21
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.20 Tue Jun 24 22:22:48 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 15 13:11:08 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.20 2008/06/24 22:22:48 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.21 2008/07/15 13:11:08 andrey Exp $ */
/* TODO:
*
@@ -687,6 +687,8 @@
client_flags ^= CLIENT_LOCAL_FILES;
}
+ client_flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow
multi_queries via connect parameter */
+
hashed_details_length = spprintf(&hashed_details, 0,
"mysql_%s_%s_%s_%ld", SAFE_STRING(host_and_port), SAFE_STRING(user),
SAFE_STRING(passwd), client_flags);
}
@@ -738,7 +740,7 @@
/* create the link */
mysql = (php_mysql_conn *)
malloc(sizeof(php_mysql_conn));
mysql->active_result_id = 0;
- mysql->multi_query = 1;
+ mysql->multi_query = client_flags &
CLIENT_MULTI_STATEMENTS? 1:0;
#ifndef MYSQL_USE_MYSQLND
mysql->conn = mysql_init(NULL);
#else
@@ -786,7 +788,7 @@
}
mysql = (php_mysql_conn *) le->ptr;
mysql->active_result_id = 0;
- mysql->multi_query = 1;
+ mysql->multi_query = client_flags &
CLIENT_MULTI_STATEMENTS? 1:0;
/* ensure that the link did not die */
if (mysql_ping(mysql->conn)) {
if (mysql_errno(mysql->conn) == 2006) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.26&r2=1.72.2.16.2.17.2.27&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.26
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.27
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.26 Tue Jun 24 22:22:48 2008
+++ php-src/ext/mysqli/mysqli.c Tue Jul 15 13:11:09 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.26 2008/06/24 22:22:48 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.27 2008/07/15 13:11:09 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -893,6 +893,12 @@
#endif
#endif
+ REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED",
SERVER_QUERY_NO_GOOD_INDEX_USED, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_INDEX_USED",
SERVER_QUERY_NO_INDEX_USED, CONST_CS | CONST_PERSISTENT);
+#ifdef SERVER_QUERY_WAS_SLOW
+ REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_WAS_SLOW",
SERVER_QUERY_WAS_SLOW, CONST_CS | CONST_PERSISTENT);
+#endif
+
return SUCCESS;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.23&r2=1.5.2.24&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.23
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.24
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.23 Tue Jun 24 22:22:48 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jul 15 13:11:09 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.c,v 1.5.2.23 2008/06/24 22:22:48 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.24 2008/07/15 13:11:09 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -467,7 +467,6 @@
DBG_ENTER("_mysqlnd_end_psession");
/* The thd zval cache is always freed on request shutdown, so this has
happened already */
mysqlnd_palloc_free_thd_cache_reference(&conn->zval_cache);
- conn->zval_cache = NULL;
DBG_VOID_RETURN;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.c?r1=1.2.2.11&r2=1.2.2.12&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.11
php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.12
--- php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.11 Tue Jun 24 22:22:48 2008
+++ php-src/ext/mysqlnd/mysqlnd_palloc.c Tue Jul 15 13:11:09 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_palloc.c,v 1.2.2.11 2008/06/24 22:22:48 andrey Exp $ */
+/* $Id: mysqlnd_palloc.c,v 1.2.2.12 2008/07/15 13:11:09 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_priv.h"
@@ -172,7 +172,7 @@
if (cache) {
++cache->references;
DBG_INF_FMT("cache=%p new_refc=%d gc_list.canary1=%p
gc_list.canary2=%p",
- *cache, cache->references,
cache->gc_list.canary1, cache->gc_list.canary2);
+ cache, cache->references,
cache->gc_list.canary1, cache->gc_list.canary2);
mysqlnd_palloc_get_cache_reference(cache->parent);
}
DBG_RETURN(cache);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps.c?r1=1.3.2.14&r2=1.3.2.15&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.14
php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.15
--- php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.14 Thu Apr 24 14:22:19 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps.c Tue Jul 15 13:11:09 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_ps.c,v 1.3.2.14 2008/04/24 14:22:19 andrey Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.3.2.15 2008/07/15 13:11:09 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -582,7 +582,7 @@
SET_ERROR_AFF_ROWS(stmt);
SET_ERROR_AFF_ROWS(stmt->conn);
- if (stmt->state > MYSQLND_STMT_PREPARED && stmt->field_count) {
+ if (stmt->result && stmt->state > MYSQLND_STMT_PREPARED &&
stmt->field_count) {
/*
We don need to copy the data from the buffers which we will
clean.
Because it has already been copied. See
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.14&r2=1.4.2.15&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.14
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.15
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.14 Thu Apr 24 14:22:19 2008
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Tue Jul 15 13:11:09 2008
@@ -690,8 +690,6 @@
packet->client_flags ^= CLIENT_LOCAL_FILES;
}
- /* don't allow multi_queries via connect parameter */
- packet->client_flags ^= CLIENT_MULTI_STATEMENTS;
int4store(p, packet->client_flags);
p+= 4;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
