iliaa Sun Mar 5 17:18:01 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql php_pdo_mysql_int.h mysql_driver.c
pdo_mysql.c
/php-src NEWS
Log:
MFH:
Fixed bug #36572 (Added PDO::MYSQL_ATTR_DIRECT_QUERY constant that show be
set when executing internal queries such as "show master status" via MySQL).
Added missing constant for MAX_BUFFER_SIZE.
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/php_pdo_mysql_int.h?r1=1.16.2.3&r2=1.16.2.4&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.3
php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.16.2.4
--- php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.16.2.3 Tue Feb 14 14:26:11 2006
+++ php-src/ext/pdo_mysql/php_pdo_mysql_int.h Sun Mar 5 17:18:01 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_mysql_int.h,v 1.16.2.3 2006/02/14 14:26:11 iliaa Exp $ */
+/* $Id: php_pdo_mysql_int.h,v 1.16.2.4 2006/03/05 17:18:01 iliaa Exp $ */
#ifndef PHP_PDO_MYSQL_INT_H
#define PHP_PDO_MYSQL_INT_H
@@ -37,6 +37,7 @@
unsigned attached:1;
unsigned buffered:1;
+ unsigned emulate_prepare:1;
unsigned _reserved:31;
unsigned long max_buffer_size;
@@ -84,5 +85,6 @@
PDO_MYSQL_ATTR_READ_DEFAULT_FILE,
PDO_MYSQL_ATTR_READ_DEFAULT_GROUP,
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE,
+ PDO_MYSQL_ATTR_DIRECT_QUERY,
};
#endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.9&r2=1.59.2.10&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.9
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.10
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.9 Tue Feb 14 14:26:11 2006
+++ php-src/ext/pdo_mysql/mysql_driver.c Sun Mar 5 17:18:01 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_driver.c,v 1.59.2.9 2006/02/14 14:26:11 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.59.2.10 2006/03/05 17:18:01 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -169,6 +169,10 @@
stmt->driver_data = S;
stmt->methods = &mysql_stmt_methods;
+ if (H->emulate_prepare) {
+ goto end;
+ }
+
/* TODO: add runtime check to determine if the server we are talking to
supports
* prepared statements; if it doesn't, we should set
stmt->supports_placeholders
* to PDO_PLACEHOLDER_NONE, and have the rest of the code look at
S->stmt to
@@ -230,6 +234,7 @@
fallback:
#endif
+end:
stmt->supports_placeholders = PDO_PLACEHOLDER_NONE;
return 1;
@@ -312,7 +317,9 @@
case PDO_MYSQL_ATTR_USE_BUFFERED_QUERY:
((pdo_mysql_db_handle *)dbh->driver_data)->buffered =
Z_BVAL_P(val);
return 1;
-
+ case PDO_MYSQL_ATTR_DIRECT_QUERY:
+ ((pdo_mysql_db_handle *)dbh->driver_data)->emulate_prepare =
Z_BVAL_P(val);
+ return 1;
default:
return 0;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.8.2.12&r2=1.8.2.13&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.12
php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.13
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.12 Sun Jan 1 12:50:11 2006
+++ php-src/ext/pdo_mysql/pdo_mysql.c Sun Mar 5 17:18:01 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_mysql.c,v 1.8.2.12 2006/01/01 12:50:11 sniper Exp $ */
+/* $Id: pdo_mysql.c,v 1.8.2.13 2006/03/05 17:18:01 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -80,6 +80,8 @@
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_INIT_COMMAND",
(long)PDO_MYSQL_ATTR_INIT_COMMAND);
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_READ_DEFAULT_FILE",
(long)PDO_MYSQL_ATTR_READ_DEFAULT_FILE);
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_READ_DEFAULT_GROUP",
(long)PDO_MYSQL_ATTR_READ_DEFAULT_GROUP);
+ REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MAX_BUFFER_SIZE",
(long)PDO_MYSQL_ATTR_MAX_BUFFER_SIZE);
+ REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_DIRECT_QUERY",
(long)PDO_MYSQL_ATTR_DIRECT_QUERY);
return php_pdo_register_driver(&pdo_mysql_driver);
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.439&r2=1.2027.2.440&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.439 php-src/NEWS:1.2027.2.440
--- php-src/NEWS:1.2027.2.439 Sun Mar 5 15:36:03 2006
+++ php-src/NEWS Sun Mar 5 17:18:01 2006
@@ -42,6 +42,9 @@
- Fixed bug #36599 (DATE_W3C format constant incorrect). (Derick)
- Fixed bug #36575 (SOAP: Incorrect complex type instantiation with
hierarchies). (Dmitry)
+- Fixed bug #36572 (Added PDO::MYSQL_ATTR_DIRECT_QUERY constant that show be
+ set when executing internal queries such as "show master status" via MySQL).
+ (Ilia)
- Fixed bug #36510 (strtotime() fails to parse date strings with tabs). (Ilia,
Derick)
- Fixed bug #36459 (Incorrect adding PHPSESSID to links, which contains \r\n).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
