andrey Tue Feb 19 15:38:24 2008 UTC
Modified files:
/php-src/ext/mysqli/tests mysqli_constants.phpt
/php-src/ext/mysqlnd php_mysqlnd.c
Log:
Fix a compile warning + test
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_constants.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_constants.phpt
diff -u php-src/ext/mysqli/tests/mysqli_constants.phpt:1.3
php-src/ext/mysqli/tests/mysqli_constants.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_constants.phpt:1.3 Wed Oct 10 10:51:34 2007
+++ php-src/ext/mysqli/tests/mysqli_constants.phpt Tue Feb 19 15:38:24 2008
@@ -44,6 +44,8 @@
"MYSQLI_TIMESTAMP_FLAG" => true,
"MYSQLI_SET_FLAG" => true,
"MYSQLI_NUM_FLAG" => true,
+ "MYSQLI_ENUM_FLAG" => true,
+ "MYSQLI_BINARY_FLAG" => true,
"MYSQLI_PART_KEY_FLAG" => true,
"MYSQLI_GROUP_FLAG" => true,
"MYSQLI_TYPE_DECIMAL" => true,
@@ -90,10 +92,16 @@
$version = 50007 + 1;
$expected_constants['MYSQLI_OPT_NET_CMD_BUFFER_SIZE'] = true;
$expected_constants['MYSQLI_OPT_NET_READ_BUFFER_SIZE'] = true;
+ $expected_constants['MYSQLI_DEBUG_TRACE_ENABLED'] = true;
+
} else {
$version = mysqli_get_client_version();
}
+ if (($version > 51122 && $version < 60000) || ($version > 60003) ||
$IS_MYSQLND) {
+ $expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
+ }
+
if ($version > 50002) {
$expected_constants = array_merge($expected_constants, array(
"MYSQLI_TYPE_NEWDECIMAL" => true,
@@ -101,6 +109,10 @@
));
}
+ if ($version > 50002 || $IS_MYSQLND) {
+ $expected_constants['MYSQLI_NO_DEFAULT_VALUE_FLAG'] = true;
+ }
+
if ($version > 50003) {
$expected_constants = array_merge($expected_constants, array(
"MYSQLI_STMT_ATTR_CURSOR_TYPE" => true,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.4
php-src/ext/mysqlnd/php_mysqlnd.c:1.5
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.4 Thu Feb 14 15:20:08 2008
+++ php-src/ext/mysqlnd/php_mysqlnd.c Tue Feb 19 15:38:24 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysqlnd.c,v 1.4 2008/02/14 15:20:08 andrey Exp $ */
+/* $Id: php_mysqlnd.c,v 1.5 2008/02/19 15:38:24 andrey Exp $ */
#include "php.h"
#include "php_ini.h"
#include "mysqlnd.h"
@@ -226,7 +226,7 @@
mysqlnd_functions,
PHP_MINIT(mysqlnd),
PHP_MSHUTDOWN(mysqlnd),
-#ifdef PHP_DEBUG || defined(MYSQLND_THREADED)
+#if defined(PHP_DEBUG) || defined(MYSQLND_THREADED)
PHP_RINIT(mysqlnd),
#else
NULL,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
