up to 7.0.0 snapshot from php-src master

[packages/php.git] / mysql-lib-ver-mismatch.patch

diff --git a/mysql-lib-ver-mismatch.patch b/mysql-lib-ver-mismatch.patch
index d49d195ef0a3c52bac00b56aa5639a079c114a11..81d9261e91a4780dbaeca2c18a89f9de8d7041aa 100644 (file)
--- a/mysql-lib-ver-mismatch.patch
+++ b/mysql-lib-ver-mismatch.patch
@@ -4,17 +4,6 @@
        zend_bool                       self_alloced = 0;
  
  
--#if !defined(MYSQL_USE_MYSQLND)
-+#if 0 && !defined(MYSQL_USE_MYSQLND)
-       if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
-               php_error_docref(NULL TSRMLS_CC, E_NOTICE,
-                                               "Headers and client library minor version mismatch. Headers:%d Library:%ld",
---- php-5.3.27/ext/mysql/php_mysql.c~  2013-11-20 00:19:11.000000000 +0200
-+++ php-5.3.27/ext/mysql/php_mysql.c   2013-11-20 00:20:01.719956531 +0200
-@@ -704,7 +704,7 @@
-       zend_bool free_host=0, new_link=0;
-       long connect_timeout;
- 
 -#if !defined(MYSQL_USE_MYSQLND)
 +#if 0 && !defined(MYSQL_USE_MYSQLND)
        if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {