drop php-mysql-nowarning.patch

whole block is disabled by other patch: mysql-lib-ver-mismatch.patch

diff --git a/php-mysql-nowarning.patch b/php-mysql-nowarning.patch
deleted file mode 100644 (file)
index ee6e11c..0000000
--- a/php-mysql-nowarning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- php-5.3.6/ext/mysql/php_mysql.c~   2011-04-13 20:47:29.263652096 +0200
-+++ php-5.3.6/ext/mysql/php_mysql.c    2011-04-13 20:48:30.206453191 +0200
-@@ -706,7 +706,7 @@
- 
- #if !defined(MYSQL_USE_MYSQLND)
-       if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
--              php_error_docref(NULL TSRMLS_CC, E_WARNING,
-+              php_error_docref(NULL TSRMLS_CC, E_NOTICE,
-                                               "Headers and client library minor version mismatch. Headers:%d Library:%ld",
-                                               MYSQL_VERSION_ID, mysql_get_client_version());
-       }
---- php-5.3.6/ext/mysqli/mysqli_nonapi.c~      2011-04-13 20:47:29.273652556 +0200
-+++ php-5.3.6/ext/mysqli/mysqli_nonapi.c       2011-04-13 20:48:41.070285840 +0200
-@@ -75,7 +75,7 @@
- 
- #if !defined(MYSQL_USE_MYSQLND)
-       if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
--              php_error_docref(NULL TSRMLS_CC, E_WARNING,
-+              php_error_docref(NULL TSRMLS_CC, E_NOTICE,
-                                               "Headers and client library minor version mismatch. Headers:%d Library:%ld",
-                                               MYSQL_VERSION_ID, mysql_get_client_version());
-       }

diff --git a/php.spec b/php.spec
index bacc67ba39317d1d586f221f993c2e671c3dcfae..ce566267e38e2604f62a96c28da61604053b350f 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -199,7 +199,6 @@ Patch55:    bug-52078-fileinode.patch
 Patch59:       %{orgname}-systzdata.patch
 Patch60:       %{orgname}-oracle-instantclient.patch
 Patch62:       mcrypt-libs.patch
-Patch63:       %{orgname}-mysql-nowarning.patch
 Patch65:       system-libzip.patch
 Patch66:       php-db.patch
 Patch67:       mysql-lib-ver-mismatch.patch
@@ -2051,7 +2050,6 @@ exit 1
 %patch59 -p1
 %patch60 -p1
 %patch62 -p1
-%patch63 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
 %patch67 -p1