| List: | Commits | « Previous MessageNext Message » | |
| From: | ahristov | Date: | September 27 2007 9:02pm |
| Subject: | PHP mysqlnd svn commit: r1064 - in trunk: mysqlnd php4/ext/mysql php5/ext/mysql php5/ext/mysqli php6/ext/mysqli tests/ext/mysql tests/ext/mysqli | ||
| View as plain text | |||
Author: ahristov Date: 2007-09-27 21:02:06 +0200 (Thu, 27 Sep 2007) New Revision: 1064 Modified: trunk/mysqlnd/mysqlnd.h trunk/mysqlnd/mysqlnd_debug.c trunk/php4/ext/mysql/php_mysql.c trunk/php5/ext/mysql/php_mysql.c trunk/php5/ext/mysqli/mysqli.c trunk/php5/ext/mysqli/mysqli_driver.c trunk/php5/ext/mysqli/mysqli_exception.c trunk/php5/ext/mysqli/mysqli_fe.c trunk/php5/ext/mysqli/mysqli_prop.c trunk/php5/ext/mysqli/mysqli_warning.c trunk/php5/ext/mysqli/php_mysqli_structs.h trunk/php6/ext/mysqli/mysqli.c trunk/php6/ext/mysqli/mysqli_driver.c trunk/php6/ext/mysqli/mysqli_exception.c trunk/php6/ext/mysqli/mysqli_fe.c trunk/php6/ext/mysqli/mysqli_prop.c trunk/php6/ext/mysqli/mysqli_warning.c trunk/php6/ext/mysqli/php_mysqli_structs.h trunk/tests/ext/mysql/mysql_trace_mode.phpt trunk/tests/ext/mysqli/mysqli_change_user_get_lock.phpt trunk/tests/ext/mysqli/mysqli_change_user_locks_temporary.phpt trunk/tests/ext/mysqli/mysqli_real_escape_string_nobackslash.phpt Log: - Fix 2 tests - Skip two tests because of server bug, which will be reported separately - Fix PHP6 build I broke minutes ago - Port const change from the PHP CVS (there still only PHP 5_3) Modified: trunk/mysqlnd/mysqlnd.h =================================================================== --- trunk/mysqlnd/mysqlnd.h 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/mysqlnd/mysqlnd.h 2007-09-27 19:02:06 UTC (rev 1064) @@ -23,13 +23,9 @@ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.2-dev - 070702 - $Revision$" +#define MYSQLND_VERSION "mysqlnd 5.0.2-dev - 070928 - $Revision$" #define MYSQLND_VERSION_ID 50002 -#define phpext_mysqlnd_ptr &mysqlnd_module_entry -extern zend_module_entry mysqlnd_module_entry; - - /* This forces inlining of some accessor functions */ #define MYSQLND_USE_OPTIMISATIONS 0 Modified: trunk/mysqlnd/mysqlnd_debug.c =================================================================== --- trunk/mysqlnd/mysqlnd_debug.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/mysqlnd/mysqlnd_debug.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -1087,7 +1087,7 @@ /* }}} */ -static int _build_trace_string(zval **frame, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ +static int mysqlnd_build_trace_string(zval **frame, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { char *s_tmp, **str; int *len, *num; @@ -1123,7 +1123,7 @@ TRACE_APPEND_CHR('('); if (zend_ascii_hash_find(ht, "args", sizeof("args"), (void**)&tmp) == SUCCESS) { int last_len = *len; - zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp), (apply_func_args_t)_build_trace_args, 2, str, len); + zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp), (apply_func_args_t)mysqlnd_build_trace_args, 2, str, len); if (last_len != *len) { *len -= 2; /* remove last ', ' */ } Modified: trunk/php4/ext/mysql/php_mysql.c =================================================================== --- trunk/php4/ext/mysql/php_mysql.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php4/ext/mysql/php_mysql.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -130,7 +130,7 @@ /* {{{ mysql_functions[] */ -function_entry mysql_functions[] = { +const function_entry mysql_functions[] = { PHP_FE(mysql_connect, NULL) PHP_FE(mysql_pconnect, NULL) PHP_FE(mysql_close, NULL) Modified: trunk/php5/ext/mysql/php_mysql.c =================================================================== --- trunk/php5/ext/mysql/php_mysql.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php5/ext/mysql/php_mysql.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -137,7 +137,7 @@ /* {{{ mysql_functions[] */ -zend_function_entry mysql_functions[] = { +const zend_function_entry mysql_functions[] = { PHP_FE(mysql_connect, NULL) PHP_FE(mysql_pconnect, NULL) PHP_FE(mysql_close, NULL) Modified: trunk/php5/ext/mysqli/mysqli.c =================================================================== --- trunk/php5/ext/mysqli/mysqli.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php5/ext/mysqli/mysqli.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -503,7 +503,7 @@ /* Dependancies */ -static zend_module_dep mysqli_deps[] = { +const static zend_module_dep mysqli_deps[] = { #if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1)) ZEND_MOD_REQUIRED("spl") #endif Modified: trunk/php5/ext/mysqli/mysqli_driver.c =================================================================== --- trunk/php5/ext/mysqli/mysqli_driver.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php5/ext/mysqli/mysqli_driver.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -140,7 +140,7 @@ #endif } -mysqli_property_entry mysqli_driver_property_entries[] = { +const mysqli_property_entry mysqli_driver_property_entries[] = { {"client_info", driver_client_info_read, NULL}, {"client_version", driver_client_version_read, NULL}, {"driver_version", driver_driver_version_read, NULL}, @@ -152,7 +152,7 @@ /* {{{ mysqli_driver_methods[] */ -zend_function_entry mysqli_driver_methods[] = { +const zend_function_entry mysqli_driver_methods[] = { #if defined(HAVE_EMBEDDED_MYSQLI) PHP_FALIAS(embedded_server_start, mysqli_embedded_server_start, NULL) PHP_FALIAS(embedded_server_end, mysqli_embedded_server_end, NULL) Modified: trunk/php5/ext/mysqli/mysqli_exception.c =================================================================== --- trunk/php5/ext/mysqli/mysqli_exception.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php5/ext/mysqli/mysqli_exception.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -30,7 +30,7 @@ /* {{{ mysqli_exception_methods[] */ -zend_function_entry mysqli_exception_methods[] = { +const zend_function_entry mysqli_exception_methods[] = { {NULL, NULL, NULL} }; /* }}} */ Modified: trunk/php5/ext/mysqli/mysqli_fe.c =================================================================== --- trunk/php5/ext/mysqli/mysqli_fe.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php5/ext/mysqli/mysqli_fe.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -50,7 +50,7 @@ * * Every user visible function must have an entry in mysqli_functions[]. */ -zend_function_entry mysqli_functions[] = { +const zend_function_entry mysqli_functions[] = { PHP_FE(mysqli_affected_rows, NULL) PHP_FE(mysqli_autocommit, NULL) PHP_FE(mysqli_change_user, NULL) @@ -193,7 +193,7 @@ * * Every user visible function must have an entry in mysqli_functions[]. */ -zend_function_entry mysqli_link_methods[] = { +const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(autocommit,mysqli_autocommit,NULL) PHP_FALIAS(change_user,mysqli_change_user,NULL) PHP_FALIAS(character_set_name, mysqli_character_set_name,NULL) @@ -261,7 +261,7 @@ * * Every user visible function must have an entry in mysqli_result_functions[]. */ -zend_function_entry mysqli_result_methods[] = { +const zend_function_entry mysqli_result_methods[] = { PHP_FALIAS(__construct, mysqli_result_construct, NULL) PHP_FALIAS(close,mysqli_free_result,NULL) PHP_FALIAS(free,mysqli_free_result,NULL) @@ -286,7 +286,7 @@ * * Every user visible function must have an entry in mysqli_stmt_functions[]. */ -zend_function_entry mysqli_stmt_methods[] = { +const zend_function_entry mysqli_stmt_methods[] = { PHP_FALIAS(__construct, mysqli_stmt_construct, NULL) PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL) PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL) Modified: trunk/php5/ext/mysqli/mysqli_prop.c =================================================================== --- trunk/php5/ext/mysqli/mysqli_prop.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php5/ext/mysqli/mysqli_prop.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -311,7 +311,7 @@ MYSQLI_MAP_PROPERTY_FUNC_STRING(stmt_sqlstate_read, mysql_stmt_sqlstate, MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED)); /* }}} */ -mysqli_property_entry mysqli_link_property_entries[] = { +const mysqli_property_entry mysqli_link_property_entries[] = { {"affected_rows", link_affected_rows_read, NULL}, {"client_info", link_client_info_read, NULL}, {"client_version", link_client_version_read, NULL}, @@ -332,7 +332,7 @@ {NULL, NULL, NULL} }; -mysqli_property_entry mysqli_result_property_entries[] = { +const mysqli_property_entry mysqli_result_property_entries[] = { {"current_field", result_current_field_read, NULL}, {"field_count", result_field_count_read, NULL}, {"lengths", result_lengths_read, NULL}, @@ -341,7 +341,7 @@ {NULL, NULL, NULL} }; -mysqli_property_entry mysqli_stmt_property_entries[] = { +const mysqli_property_entry mysqli_stmt_property_entries[] = { {"affected_rows", stmt_affected_rows_read, NULL}, {"insert_id", stmt_insert_id_read, NULL}, {"num_rows", stmt_num_rows_read, NULL}, Modified: trunk/php5/ext/mysqli/mysqli_warning.c =================================================================== --- trunk/php5/ext/mysqli/mysqli_warning.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php5/ext/mysqli/mysqli_warning.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -312,7 +312,7 @@ /* }}} */ /* {{{ mysqli_warning_methods */ -zend_function_entry mysqli_warning_methods[] = { +const zend_function_entry mysqli_warning_methods[] = { PHP_ME(mysqli_warning, __construct, NULL, ZEND_ACC_PROTECTED) PHP_ME(mysqli_warning, next, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} @@ -320,7 +320,7 @@ /* }}} */ /* {{{ mysqli_warning_property_entries */ -mysqli_property_entry mysqli_warning_property_entries[] = { +const mysqli_property_entry mysqli_warning_property_entries[] = { {"message", mysqli_warning_message, NULL}, {"sqlstate", mysqli_warning_sqlstate, NULL}, {"errno", mysqli_warning_errno, NULL}, Modified: trunk/php5/ext/mysqli/php_mysqli_structs.h =================================================================== --- trunk/php5/ext/mysqli/php_mysqli_structs.h 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php5/ext/mysqli/php_mysqli_structs.h 2007-09-27 19:02:06 UTC (rev 1064) @@ -160,19 +160,19 @@ #define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type -extern zend_function_entry mysqli_functions[]; -extern zend_function_entry mysqli_link_methods[]; -extern zend_function_entry mysqli_stmt_methods[]; -extern zend_function_entry mysqli_result_methods[]; -extern zend_function_entry mysqli_driver_methods[]; -extern zend_function_entry mysqli_warning_methods[]; -extern zend_function_entry mysqli_exception_methods[]; +extern const zend_function_entry mysqli_functions[]; +extern const zend_function_entry mysqli_link_methods[]; +extern const zend_function_entry mysqli_stmt_methods[]; +extern const zend_function_entry mysqli_result_methods[]; +extern const zend_function_entry mysqli_driver_methods[]; +extern const zend_function_entry mysqli_warning_methods[]; +extern const zend_function_entry mysqli_exception_methods[]; -extern mysqli_property_entry mysqli_link_property_entries[]; -extern mysqli_property_entry mysqli_result_property_entries[]; -extern mysqli_property_entry mysqli_stmt_property_entries[]; -extern mysqli_property_entry mysqli_driver_property_entries[]; -extern mysqli_property_entry mysqli_warning_property_entries[]; +extern const mysqli_property_entry mysqli_link_property_entries[]; +extern const mysqli_property_entry mysqli_result_property_entries[]; +extern const mysqli_property_entry mysqli_stmt_property_entries[]; +extern const mysqli_property_entry mysqli_driver_property_entries[]; +extern const mysqli_property_entry mysqli_warning_property_entries[]; #ifdef HAVE_MYSQLND extern MYSQLND_ZVAL_PCACHE *mysqli_mysqlnd_zval_cache; Modified: trunk/php6/ext/mysqli/mysqli.c =================================================================== --- trunk/php6/ext/mysqli/mysqli.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php6/ext/mysqli/mysqli.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -507,7 +507,7 @@ /* Dependancies */ -static zend_module_dep mysqli_deps[] = { +static const zend_module_dep mysqli_deps[] = { #if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1)) ZEND_MOD_REQUIRED("spl") #endif Modified: trunk/php6/ext/mysqli/mysqli_driver.c =================================================================== --- trunk/php6/ext/mysqli/mysqli_driver.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php6/ext/mysqli/mysqli_driver.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -142,7 +142,7 @@ ((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource; } -mysqli_property_entry mysqli_driver_property_entries[] = { +const mysqli_property_entry mysqli_driver_property_entries[] = { {"client_info", driver_client_info_read, NULL}, {"client_version", driver_client_version_read, NULL}, {"driver_version", driver_driver_version_read, NULL}, @@ -154,7 +154,7 @@ /* {{{ mysqli_driver_methods[] */ -zend_function_entry mysqli_driver_methods[] = { +const zend_function_entry mysqli_driver_methods[] = { #if defined(HAVE_EMBEDDED_MYSQLI) PHP_FALIAS(embedded_server_start, mysqli_embedded_server_start, NULL) PHP_FALIAS(embedded_server_end, mysqli_embedded_server_end, NULL) Modified: trunk/php6/ext/mysqli/mysqli_exception.c =================================================================== --- trunk/php6/ext/mysqli/mysqli_exception.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php6/ext/mysqli/mysqli_exception.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -32,7 +32,7 @@ /* {{{ mysqli_exception_methods[] */ -zend_function_entry mysqli_exception_methods[] = { +const zend_function_entry mysqli_exception_methods[] = { {NULL, NULL, NULL} }; /* }}} */ Modified: trunk/php6/ext/mysqli/mysqli_fe.c =================================================================== --- trunk/php6/ext/mysqli/mysqli_fe.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php6/ext/mysqli/mysqli_fe.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -52,7 +52,7 @@ * * Every user visible function must have an entry in mysqli_functions[]. */ -zend_function_entry mysqli_functions[] = { +const zend_function_entry mysqli_functions[] = { PHP_FE(mysqli_affected_rows, NULL) PHP_FE(mysqli_autocommit, NULL) PHP_FE(mysqli_change_user, NULL) @@ -195,7 +195,7 @@ * * Every user visible function must have an entry in mysqli_functions[]. */ -zend_function_entry mysqli_link_methods[] = { +const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(autocommit,mysqli_autocommit,NULL) PHP_FALIAS(change_user,mysqli_change_user,NULL) PHP_FALIAS(character_set_name, mysqli_character_set_name,NULL) @@ -263,7 +263,7 @@ * * Every user visible function must have an entry in mysqli_result_functions[]. */ -zend_function_entry mysqli_result_methods[] = { +const zend_function_entry mysqli_result_methods[] = { PHP_FALIAS(__construct, mysqli_result_construct, NULL) PHP_FALIAS(close,mysqli_free_result,NULL) PHP_FALIAS(free,mysqli_free_result,NULL) @@ -288,7 +288,7 @@ * * Every user visible function must have an entry in mysqli_stmt_functions[]. */ -zend_function_entry mysqli_stmt_methods[] = { +const zend_function_entry mysqli_stmt_methods[] = { PHP_FALIAS(__construct, mysqli_stmt_construct, NULL) PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL) PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL) Modified: trunk/php6/ext/mysqli/mysqli_prop.c =================================================================== --- trunk/php6/ext/mysqli/mysqli_prop.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php6/ext/mysqli/mysqli_prop.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -313,7 +313,7 @@ MYSQLI_MAP_PROPERTY_FUNC_STRING(stmt_sqlstate_read, mysql_stmt_sqlstate, MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED)); /* }}} */ -mysqli_property_entry mysqli_link_property_entries[] = { +const mysqli_property_entry mysqli_link_property_entries[] = { {"affected_rows", link_affected_rows_read, NULL}, {"client_info", link_client_info_read, NULL}, {"client_version", link_client_version_read, NULL}, @@ -334,7 +334,7 @@ {NULL, NULL, NULL} }; -mysqli_property_entry mysqli_result_property_entries[] = { +const mysqli_property_entry mysqli_result_property_entries[] = { {"current_field", result_current_field_read, NULL}, {"field_count", result_field_count_read, NULL}, {"lengths", result_lengths_read, NULL}, @@ -343,7 +343,7 @@ {NULL, NULL, NULL} }; -mysqli_property_entry mysqli_stmt_property_entries[] = { +const mysqli_property_entry mysqli_stmt_property_entries[] = { {"affected_rows", stmt_affected_rows_read, NULL}, {"insert_id", stmt_insert_id_read, NULL}, {"num_rows", stmt_num_rows_read, NULL}, Modified: trunk/php6/ext/mysqli/mysqli_warning.c =================================================================== --- trunk/php6/ext/mysqli/mysqli_warning.c 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php6/ext/mysqli/mysqli_warning.c 2007-09-27 19:02:06 UTC (rev 1064) @@ -313,7 +313,7 @@ /* }}} */ /* {{{ mysqli_warning_methods */ -zend_function_entry mysqli_warning_methods[] = { +const zend_function_entry mysqli_warning_methods[] = { PHP_ME(mysqli_warning, __construct, NULL, ZEND_ACC_PROTECTED) PHP_ME(mysqli_warning, next, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} @@ -321,7 +321,7 @@ /* }}} */ /* {{{ mysqli_warning_property_entries */ -mysqli_property_entry mysqli_warning_property_entries[] = { +const mysqli_property_entry mysqli_warning_property_entries[] = { {"message", mysqli_warning_message, NULL}, {"sqlstate", mysqli_warning_sqlstate, NULL}, {"errno", mysqli_warning_errno, NULL}, Modified: trunk/php6/ext/mysqli/php_mysqli_structs.h =================================================================== --- trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-09-27 19:02:06 UTC (rev 1064) @@ -172,19 +172,19 @@ #define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type -extern zend_function_entry mysqli_functions[]; -extern zend_function_entry mysqli_link_methods[]; -extern zend_function_entry mysqli_stmt_methods[]; -extern zend_function_entry mysqli_result_methods[]; -extern zend_function_entry mysqli_driver_methods[]; -extern zend_function_entry mysqli_warning_methods[]; -extern zend_function_entry mysqli_exception_methods[]; +extern const zend_function_entry mysqli_functions[]; +extern const zend_function_entry mysqli_link_methods[]; +extern const zend_function_entry mysqli_stmt_methods[]; +extern const zend_function_entry mysqli_result_methods[]; +extern const zend_function_entry mysqli_driver_methods[]; +extern const zend_function_entry mysqli_warning_methods[]; +extern const zend_function_entry mysqli_exception_methods[]; -extern mysqli_property_entry mysqli_link_property_entries[]; -extern mysqli_property_entry mysqli_result_property_entries[]; -extern mysqli_property_entry mysqli_stmt_property_entries[]; -extern mysqli_property_entry mysqli_driver_property_entries[]; -extern mysqli_property_entry mysqli_warning_property_entries[]; +extern const mysqli_property_entry mysqli_link_property_entries[]; +extern const mysqli_property_entry mysqli_result_property_entries[]; +extern const mysqli_property_entry mysqli_stmt_property_entries[]; +extern const mysqli_property_entry mysqli_driver_property_entries[]; +extern const mysqli_property_entry mysqli_warning_property_entries[]; #ifdef HAVE_MYSQLND extern MYSQLND_ZVAL_PCACHE *mysqli_mysqlnd_zval_cache; Modified: trunk/tests/ext/mysql/mysql_trace_mode.phpt =================================================================== --- trunk/tests/ext/mysql/mysql_trace_mode.phpt 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/tests/ext/mysql/mysql_trace_mode.phpt 2007-09-27 19:02:06 UTC (rev 1064) @@ -11,6 +11,7 @@ $res1 = mysql_query('SELECT id FROM test', $link); +var_dump(error_reporting(E_ALL | E_NOTICE | E_STRICT)); if (!$res2 = mysql_db_query('phptest', 'SELECT id FROM test', $link)) printf("[001] [%d] %s\n", mysql_errno($link), mysql_error($link)); mysql_free_result($res2); @@ -29,4 +30,4 @@ Warning: mysql_query(): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BOGUS_SQL' at line 1 in %s on line %d done! -Warning: Unknown: 1 result set(s) not freed. Use mysql_free_result to free result sets which were requested using mysql_query() in %s on line %d \ No newline at end of file +Warning: Unknown: 1 result set(s) not freed. Use mysql_free_result to free result sets which were requested using mysql_query() in %s on line %d Modified: trunk/tests/ext/mysqli/mysqli_change_user_get_lock.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_change_user_get_lock.phpt 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/tests/ext/mysqli/mysqli_change_user_get_lock.phpt 2007-09-27 19:02:06 UTC (rev 1064) @@ -5,6 +5,7 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); +die("skip - is the server still buggy?"); ?> --INI-- max_execution_time=240 @@ -98,4 +99,4 @@ ... calling IS_USED_LOCK() on 'phptest_%d' using thread '%d' ... calling IS_FREE_LOCK() on 'phptest_%d' using thread '%d' ... calling IS_USED_LOCK() on 'phptest_%d' using new connection with thread '%d' -done! \ No newline at end of file +done! Modified: trunk/tests/ext/mysqli/mysqli_change_user_locks_temporary.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_change_user_locks_temporary.phpt 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/tests/ext/mysqli/mysqli_change_user_locks_temporary.phpt 2007-09-27 19:02:06 UTC (rev 1064) @@ -5,6 +5,7 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); +die("skip - is the server still buggy?"); ?> --FILE-- <?php @@ -99,4 +100,4 @@ print "done!"; ?> --EXPECTF-- -done! \ No newline at end of file +done! Modified: trunk/tests/ext/mysqli/mysqli_real_escape_string_nobackslash.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_real_escape_string_nobackslash.phpt 2007-09-27 18:11:19 UTC (rev 1063) +++ trunk/tests/ext/mysqli/mysqli_real_escape_string_nobackslash.phpt 2007-09-27 19:02:06 UTC (rev 1064) @@ -20,8 +20,8 @@ if ('"' !== ($tmp = mysqli_real_escape_string($link, '"'))) printf("[003] Expecting \", got %s\n", $tmp); - if ("'" !== ($tmp = mysqli_real_escape_string($link, "'"))) - printf("[004] Expecting ', got %s\n", $tmp); + if ("''" !== ($tmp = mysqli_real_escape_string($link, "'"))) + printf("[004] Expecting '', got %s\n", $tmp); if ("\n" !== ($tmp = mysqli_real_escape_string($link, "\n"))) printf("[005] Expecting \\n, got %s\n", $tmp);
| Thread | ||
|---|---|---|
| • PHP mysqlnd svn commit: r1064 - in trunk: mysqlnd php4/ext/mysql php5/ext/mysql php5/ext/mysqli php6/ext/mysqli tests/ext/mysql tests/ext/mysqli | ahristov | 27 Sep |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.464 sec. using MySQL 5.1.14-beta-log