[packages/php] drop php-mysql-nowarning.patch
glen
glen at pld-linux.org
Sun May 24 15:48:28 CEST 2015
commit cdbf7007bd6868f081c3d940fe64e2e79779ef3c
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun May 24 16:48:02 2015 +0300
drop php-mysql-nowarning.patch
whole block is disabled by other patch: mysql-lib-ver-mismatch.patch
php-mysql-nowarning.patch | 22 ----------------------
php.spec | 2 --
2 files changed, 24 deletions(-)
---
diff --git a/php.spec b/php.spec
index bacc67b..ce56626 100644
--- 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
diff --git a/php-mysql-nowarning.patch b/php-mysql-nowarning.patch
deleted file mode 100644
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());
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/cdbf7007bd6868f081c3d940fe64e2e79779ef3c
More information about the pld-cvs-commit
mailing list