diff options
| -rw-r--r-- | ext/mysqli/tests/mysqli_constants.phpt | 12 | ||||
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt index a3d60a5da7..28573f71a9 100644 --- a/ext/mysqli/tests/mysqli_constants.phpt +++ b/ext/mysqli/tests/mysqli_constants.phpt @@ -44,6 +44,8 @@ require_once('skipifconnectfailure.inc'); "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 @@ require_once('skipifconnectfailure.inc'); $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 @@ require_once('skipifconnectfailure.inc'); )); } + 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, diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 9065bbc68d..21e9d5a58e 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -226,7 +226,7 @@ zend_module_entry mysqlnd_module_entry = { 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, |