Re: cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c

This code does not exist in head, which is why the patch was not merged. On 28-Oct-08, at 7:44 AM, Johannes Schlüter wrote:

On Mon, 2008-10-27 at 23:27 +0000, "Ilia Alshanetsky" wrote:

iliaa Mon Oct 27 23:27:21 2008 UTC

 Modified files:              (Branch: PHP_5_3)

/php-src/ext/mysql php_mysql.c Log: Fixed compiler warning

I know merging to HEAD can be annoying but in this case it shouldn't be too complicated (Andrey did meanwhile, but would be nice if you could do that yourself...) johannes

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6..2.16.2.29&r2=1.213.2.6.2.16.2.30&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.29 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.30 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.29 Mon Oct 27 12:09:36 2008 +++ php-src/ext/mysql/php_mysql.c Mon Oct 27 23:27:21 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.29 2008/10/27 12:09:36 andrey Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.30 2008/10/27 23:27:21 iliaa Exp $ */ /* TODO: * @@ -639,7 +639,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

Ilia Alshanetsky