- adjusted for rpm.org, partial PLD merge

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

diff --git a/mysql-lib-ver-mismatch.patch b/mysql-lib-ver-mismatch.patch
index 81d9261e91a4780dbaeca2c18a89f9de8d7041aa..4ebe277fa5f044bd0b26341849669ded8998087a 100644 (file)
--- a/mysql-lib-ver-mismatch.patch
+++ b/mysql-lib-ver-mismatch.patch
@@ -1,11 +1,11 @@
 --- php-5.3.27/ext/mysqli/mysqli_nonapi.c~     2013-11-20 00:19:11.000000000 +0200
 +++ php-5.3.27/ext/mysqli/mysqli_nonapi.c      2013-11-20 00:19:44.725872552 +0200
 @@ -73,7 +73,7 @@
-       zend_bool                       self_alloced = 0;
- 
- 
+       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,
+               php_error_docref(NULL, E_WARNING,
                                                "Headers and client library minor version mismatch. Headers:%d Library:%ld",