Commit:    7b92a227726106917a65c42676f87a88267a4770
Author:    Johannes Schlüter <johan...@php.net>         Tue, 23 Jul 2013 
14:13:22 +0200
Parents:   5a8b0ca8fa00fdc70b2d55be02ef9d7472990bec
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=7b92a227726106917a65c42676f87a88267a4770

Log:
Fix bug 65299

Bugs:
https://bugs.php.net/65299

Changed paths:
  M  NEWS
  M  ext/pdo_mysql/mysql_driver.c
  M  ext/pdo_mysql/pdo_mysql.c
  M  ext/pdo_mysql/php_pdo_mysql_int.h


Diff:
diff --git a/NEWS b/NEWS
index 18bb2fd..12ab119 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ PHP                                                           
             NEWS
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
     limited case). (Arpad)
 
+- PDO_mysql:
+  . Fixed bug #65299 (pdo mysql parsing errors). (Johannes)
+
 - SPL:
   . Added RecursiveTreeIterator setPostfix and getPostifx methods. (Joshua 
     Thijssen)
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index bf90f43..cd86503 100644
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -710,7 +710,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval 
*driver_options TSRMLS_
                        }
                }
 
-#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
                {
                        char *public_key = pdo_attr_strval(driver_options, 
PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL TSRMLS_CC);
                        if (public_key) {
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 401d20d..78c4cee 100644
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -118,7 +118,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
        REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", 
(long)PDO_MYSQL_ATTR_SSL_CA);
        REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", 
(long)PDO_MYSQL_ATTR_SSL_CAPATH);
        REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", 
(long)PDO_MYSQL_ATTR_SSL_CIPHER);
-#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
         REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", 
(long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
 #endif
 
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h 
b/ext/pdo_mysql/php_pdo_mysql_int.h
index 42debf0..24f7aa2 100644
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
@@ -171,7 +171,7 @@ enum {
        PDO_MYSQL_ATTR_SSL_CA,
        PDO_MYSQL_ATTR_SSL_CAPATH,
        PDO_MYSQL_ATTR_SSL_CIPHER,
-#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
        PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY
 #endif
 };


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to