cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli_nonapi.c
| From: | Andrey Hristov | Date: | Tue, 28 Oct 2008 10:45:32 +0000 |
| Subject: | cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli_nonapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53754@lists.php.net to get a copy of this message | ||
andrey Tue Oct 28 10:45:32 2008 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_nonapi.c
Log:
Fix compiler warning (MFB: Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.267&r2=1.268&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.267 php-src/ext/mysql/php_mysql.c:1.268
--- php-src/ext/mysql/php_mysql.c:1.267 Mon Oct 27 12:07:35 2008
+++ php-src/ext/mysql/php_mysql.c Tue Oct 28 10:45:31 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.267 2008/10/27 12:07:35 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.268 2008/10/28 10:45:31 andrey Exp $ */
/* TODO:
*
@@ -634,7 +634,7 @@
#if !defined(MYSQL_USE_MYSQLND)
if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
- "Headers and client library minor version mismatch. Headers:%d Library:%d",
+ "Headers and client library minor version mismatch. Headers:%d Library:%ld",
MYSQL_VERSION_ID, mysql_get_client_version());
}
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.88&r2=1.89&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.88 php-src/ext/mysqli/mysqli_nonapi.c:1.89
--- php-src/ext/mysqli/mysqli_nonapi.c:1.88 Mon Oct 27 14:30:51 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Oct 28 10:45:31 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <uw@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.88 2008/10/27 14:30:51 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.89 2008/10/28 10:45:31 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@
#if !defined(MYSQL_USE_MYSQLND)
if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
- "Headers and client library minor version mismatch. Headers:%d Library:%d",
+ "Headers and client library minor version mismatch. Headers:%d Library:%ld",
MYSQL_VERSION_ID, mysql_get_client_version());
}
#endif