johannes Mon Oct 27 18:32:09 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/pdo_mysql mysql_driver.c pdo_mysql.c
php_pdo_mysql_int.h
/php-src/ext/pdo_mysql/tests pdo_mysql_class_constants.phpt
Log:
MFH: Fix #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.353&r2=1.2027.2.547.2.965.2.354&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.353
php-src/NEWS:1.2027.2.547.2.965.2.354
--- php-src/NEWS:1.2027.2.547.2.965.2.353 Mon Oct 27 17:25:43 2008
+++ php-src/NEWS Mon Oct 27 18:32:08 2008
@@ -51,6 +51,8 @@
- Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Ilia)
- Fixed bug #45382 (timeout bug in stream_socket_enable_crypto).
(vnegrier at optilian dot com, Ilia)
+- Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes,
+ chx1975 at gmail dot com)
- Fixed bug #46192 (ArrayObject with objects as storage serialization).
(Etienne)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.13.2.5.2.5&r2=1.59.2.13.2.5.2.6&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.5
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.6
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.5 Tue Oct 14
19:00:53 2008
+++ php-src/ext/pdo_mysql/mysql_driver.c Mon Oct 27 18:32:08 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_driver.c,v 1.59.2.13.2.5.2.5 2008/10/14 19:00:53 johannes Exp $
*/
+/* $Id: mysql_driver.c,v 1.59.2.13.2.5.2.6 2008/10/27 18:32:08 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -636,6 +636,14 @@
H->max_buffer_size = pdo_attr_lval(driver_options,
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, H->max_buffer_size TSRMLS_CC);
#endif
+ if (pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_FOUND_ROWS, 0
TSRMLS_CC)) {
+ connect_opts |= CLIENT_FOUND_ROWS;
+ }
+
+ if (pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_IGNORE_SPACE,
0 TSRMLS_CC)) {
+ connect_opts |= CLIENT_IGNORE_SPACE;
+ }
+
if (mysql_options(H->server, MYSQL_OPT_CONNECT_TIMEOUT, (const
char *)&connect_timeout)) {
pdo_mysql_error(dbh);
goto cleanup;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.8.2.13.2.1.2.6&r2=1.8.2.13.2.1.2.7&diff_format=u
Index: php-src/ext/pdo_mysql/pdo_mysql.c
diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.13.2.1.2.6
php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.13.2.1.2.7
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.13.2.1.2.6 Tue Oct 14 19:00:53 2008
+++ php-src/ext/pdo_mysql/pdo_mysql.c Mon Oct 27 18:32:08 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_mysql.c,v 1.8.2.13.2.1.2.6 2008/10/14 19:00:53 johannes Exp $ */
+/* $Id: pdo_mysql.c,v 1.8.2.13.2.1.2.7 2008/10/27 18:32:08 johannes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -83,6 +83,8 @@
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_COMPRESS",
(long)PDO_MYSQL_ATTR_COMPRESS);
#endif
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_DIRECT_QUERY",
(long)PDO_MYSQL_ATTR_DIRECT_QUERY);
+ REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_FOUND_ROWS",
(long)PDO_MYSQL_ATTR_FOUND_ROWS);
+ REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_IGNORE_SPACE",
(long)PDO_MYSQL_ATTR_IGNORE_SPACE);
#ifdef PDO_USE_MYSQLND
pdo_mysqlnd_zval_cache =
mysqlnd_palloc_init_cache(PDO_MYSQL_G(cache_size));
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/php_pdo_mysql_int.h?r1=1.16.2.4.2.1.2.4&r2=1.16.2.4.2.1.2.5&diff_format=u
Index: php-src/ext/pdo_mysql/php_pdo_mysql_int.h
diff -u php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.16.2.4.2.1.2.4
php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.16.2.4.2.1.2.5
--- php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.16.2.4.2.1.2.4 Tue Oct 14
19:00:53 2008
+++ php-src/ext/pdo_mysql/php_pdo_mysql_int.h Mon Oct 27 18:32:08 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_mysql_int.h,v 1.16.2.4.2.1.2.4 2008/10/14 19:00:53 johannes
Exp $ */
+/* $Id: php_pdo_mysql_int.h,v 1.16.2.4.2.1.2.5 2008/10/27 18:32:08 johannes
Exp $ */
#ifndef PHP_PDO_MYSQL_INT_H
#define PHP_PDO_MYSQL_INT_H
@@ -161,6 +161,8 @@
PDO_MYSQL_ATTR_COMPRESS,
#endif
PDO_MYSQL_ATTR_DIRECT_QUERY,
+ PDO_MYSQL_ATTR_FOUND_ROWS,
+ PDO_MYSQL_ATTR_IGNORE_SPACE
};
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.1.2.3
php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.1.2.4
--- php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.1.2.3 Tue Oct
14 19:00:53 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt Mon Oct 27
18:32:08 2008
@@ -12,6 +12,8 @@
'MYSQL_ATTR_USE_BUFFERED_QUERY' => true,
'MYSQL_ATTR_LOCAL_INFILE'
=> true,
'MYSQL_ATTR_DIRECT_QUERY'
=> true,
+ 'MYSQL_ATTR_FOUND_ROWS'
=> true,
+ 'MYSQL_ATTR_IGNORE_SPACE'
=> true,
);
if (!MySQLPDOTest::isPDOMySQLnd()) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
