diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 18:55:15 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 19:02:20 +0200 |
| commit | a03c1ed7aa2325d91595dcf9371297ab45543517 (patch) | |
| tree | e193f83f3d5a6b7886af3371e5c688783debf22c /ext | |
| parent | 0f9aefa64f6668b571ac7c6fc9dbebb756fa1fc0 (diff) | |
| download | php-git-a03c1ed7aa2325d91595dcf9371297ab45543517.tar.gz | |
Remove vestiges of embedded mysql from tests
Diffstat (limited to 'ext')
261 files changed, 2 insertions, 295 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 620e9f1392..64601e66b4 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -521,7 +521,6 @@ static PHP_GINIT_FUNCTION(mysqli) mysqli_globals->report_mode = 0; mysqli_globals->report_ht = 0; mysqli_globals->allow_local_infile = 0; - mysqli_globals->embedded = 0; mysqli_globals->rollback_on_cached_plink = FALSE; } /* }}} */ diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c index 6bcf5902df..c40ff00583 100644 --- a/ext/mysqli/mysqli_driver.c +++ b/ext/mysqli/mysqli_driver.c @@ -81,6 +81,7 @@ static int driver_report_write(mysqli_object *obj, zval *value) /* {{{ property driver_embedded_read */ static int driver_embedded_read(mysqli_object *obj, zval *retval, zend_bool quiet) { + /* No longer supported */ ZVAL_FALSE(retval); return SUCCESS; diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index ad46511d04..16ed9ddefc 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -289,7 +289,6 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli) zend_long report_mode; HashTable *report_ht; zend_ulong multi_query; - zend_ulong embedded; zend_bool rollback_on_cached_plink; ZEND_END_MODULE_GLOBALS(mysqli) diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt index f8ddc8a38d..e902410596 100644 --- a/ext/mysqli/tests/001.phpt +++ b/ext/mysqli/tests/001.phpt @@ -3,7 +3,6 @@ mysqli connect --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt index 0a1903abf8..cb825066cd 100644 --- a/ext/mysqli/tests/017.phpt +++ b/ext/mysqli/tests/017.phpt @@ -3,7 +3,6 @@ mysqli fetch functions --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt index b5c4e3046b..387faa6de2 100644 --- a/ext/mysqli/tests/033.phpt +++ b/ext/mysqli/tests/033.phpt @@ -3,7 +3,6 @@ function test: mysqli_get_host_info --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt index f6e19ce551..655871c96f 100644 --- a/ext/mysqli/tests/034.phpt +++ b/ext/mysqli/tests/034.phpt @@ -3,7 +3,6 @@ function test: mysqli_get_proto_info --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt index 10773ace1b..af38b6786d 100644 --- a/ext/mysqli/tests/045.phpt +++ b/ext/mysqli/tests/045.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_result (SHOW) --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt index 733518609f..fff62da5f0 100644 --- a/ext/mysqli/tests/049.phpt +++ b/ext/mysqli/tests/049.phpt @@ -3,7 +3,6 @@ mysql_fetch_row (OO-Style) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt index 0a1e4ce62e..a31832b421 100644 --- a/ext/mysqli/tests/071.phpt +++ b/ext/mysqli/tests/071.phpt @@ -3,7 +3,6 @@ mysqli thread_id & kill --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/073.phpt b/ext/mysqli/tests/073.phpt index 09156532d8..496beed114 100644 --- a/ext/mysqli/tests/073.phpt +++ b/ext/mysqli/tests/073.phpt @@ -15,7 +15,7 @@ mysqli_driver properties print "done!"; ?> --EXPECTF-- -bool(%s) +bool(false) int(%d) string(%d) "%s" int(%d) diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt index 5df4065d25..ccf619d09f 100644 --- a/ext/mysqli/tests/bug33263.phpt +++ b/ext/mysqli/tests/bug33263.phpt @@ -3,7 +3,6 @@ Bug #33263 (mysqli_real_connect in __construct) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/bug42378.phpt b/ext/mysqli/tests/bug42378.phpt index 3b0638c840..3019679e5d 100644 --- a/ext/mysqli/tests/bug42378.phpt +++ b/ext/mysqli/tests/bug42378.phpt @@ -3,7 +3,6 @@ Bug #42378 (bind_result memory exhaustion, SELECT column, FORMAT(...) AS _format --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/bug45019.phpt b/ext/mysqli/tests/bug45019.phpt index faad5b9b90..c3316133f1 100644 --- a/ext/mysqli/tests/bug45019.phpt +++ b/ext/mysqli/tests/bug45019.phpt @@ -3,7 +3,6 @@ Bug #45019 (Segmentation fault with SELECT ? and UNION) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/bug52082.phpt b/ext/mysqli/tests/bug52082.phpt index f601406e8f..666804dac4 100644 --- a/ext/mysqli/tests/bug52082.phpt +++ b/ext/mysqli/tests/bug52082.phpt @@ -3,7 +3,6 @@ Bug #52082 (character_set_client & character_set_connection reset after mysqli_c --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/bug67839.phpt b/ext/mysqli/tests/bug67839.phpt index 4e8fd68ffd..b4e92d839f 100644 --- a/ext/mysqli/tests/bug67839.phpt +++ b/ext/mysqli/tests/bug67839.phpt @@ -3,7 +3,6 @@ mysqli_float_handling - ensure 4 byte float is handled correctly --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt index 27b9d16f25..5489905a0a 100644 --- a/ext/mysqli/tests/bug70384.phpt +++ b/ext/mysqli/tests/bug70384.phpt @@ -3,7 +3,6 @@ mysqli_float_handling - ensure 4 byte float is handled correctly --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (@$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { if ($link->server_version < 50709) { diff --git a/ext/mysqli/tests/bug73462.phpt b/ext/mysqli/tests/bug73462.phpt index 1aa18d7fb6..224c981dfa 100644 --- a/ext/mysqli/tests/bug73462.phpt +++ b/ext/mysqli/tests/bug73462.phpt @@ -3,7 +3,6 @@ Bug #73462 (Persistent connections don't set $connect_errno) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/bug73949.phpt b/ext/mysqli/tests/bug73949.phpt index e6bcc4ff62..d8b2f31d0b 100644 --- a/ext/mysqli/tests/bug73949.phpt +++ b/ext/mysqli/tests/bug73949.phpt @@ -3,7 +3,6 @@ Bug #73949 (leak in mysqli_fetch_object) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/bug75448.phpt b/ext/mysqli/tests/bug75448.phpt index 5900ee0565..2d6926df20 100644 --- a/ext/mysqli/tests/bug75448.phpt +++ b/ext/mysqli/tests/bug75448.phpt @@ -3,7 +3,6 @@ mysqli_prepare() called on a closed connection should return FALSE (bug #75448) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/bug76386.phpt b/ext/mysqli/tests/bug76386.phpt index 2f5ded1de4..6173ebad8c 100644 --- a/ext/mysqli/tests/bug76386.phpt +++ b/ext/mysqli/tests/bug76386.phpt @@ -3,7 +3,6 @@ Prepared Statement formatter truncates fractional seconds from date/time column --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index f89c56ef0f..b3f6580bae 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -3,7 +3,6 @@ mysqli_affected_rows() --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index 5a83d1cfb4..384ecd5e62 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -3,7 +3,6 @@ mysqli->affected_rows --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_auth_pam.phpt b/ext/mysqli/tests/mysqli_auth_pam.phpt index cdbcf2947e..a20851a4db 100644 --- a/ext/mysqli/tests/mysqli_auth_pam.phpt +++ b/ext/mysqli/tests/mysqli_auth_pam.phpt @@ -3,7 +3,6 @@ PAM auth plugin --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('connect.inc'); if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt index 21435e7a08..af3142ea44 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -3,7 +3,6 @@ mysqli_autocommit() --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('connect.inc'); require_once('skipifconnectfailure.inc'); diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 2720047e37..13e8fb0744 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -3,7 +3,6 @@ mysqli->autocommit() --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt index 7a9107b7e6..e4c87ed9db 100644 --- a/ext/mysqli/tests/mysqli_begin_transaction.phpt +++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt @@ -3,7 +3,6 @@ mysqli_begin_transaction() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt index 347126a7d4..d3a7db930f 100644 --- a/ext/mysqli/tests/mysqli_change_user.phpt +++ b/ext/mysqli/tests/mysqli_change_user.phpt @@ -3,7 +3,6 @@ mysqli_change_user() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt index 75d0930a83..605a408146 100644 --- a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt +++ b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt @@ -3,7 +3,6 @@ mysqli_change_user() - GET_LOCK() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); die("skip - is the server still buggy?"); ?> diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt index 52e1c1c491..8fe529236b 100644 --- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt @@ -3,7 +3,6 @@ mysqli_change_user() - LAST_INSERT_ID() - http://bugs.mysql.com/bug.php?id=45184 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt index f9e0e30644..c6bc2e9ee9 100644 --- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt +++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt @@ -3,7 +3,6 @@ mysqli_change_user() - table locks, GET_LOCK(), temporary tables --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); die("skip - is the server still buggy?"); ?> diff --git a/ext/mysqli/tests/mysqli_change_user_new.phpt b/ext/mysqli/tests/mysqli_change_user_new.phpt index 1d6d2f5945..a9744ce980 100644 --- a/ext/mysqli/tests/mysqli_change_user_new.phpt +++ b/ext/mysqli/tests/mysqli_change_user_new.phpt @@ -3,7 +3,6 @@ mysqli_change_user(), MySQL 5.6+ --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt index 314ff2e6df..550ff18a2b 100644 --- a/ext/mysqli/tests/mysqli_change_user_old.phpt +++ b/ext/mysqli/tests/mysqli_change_user_old.phpt @@ -3,7 +3,6 @@ mysqli_change_user(), MySQL < 5.6 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) diff --git a/ext/mysqli/tests/mysqli_change_user_oo.phpt b/ext/mysqli/tests/mysqli_change_user_oo.phpt index 5ef86a1443..bae4f8c858 100644 --- a/ext/mysqli/tests/mysqli_change_user_oo.phpt +++ b/ext/mysqli/tests/mysqli_change_user_oo.phpt @@ -3,7 +3,6 @@ mysqli->change_user() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('table.inc'); diff --git a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt index 4409d453ab..b92e5cef16 100644 --- a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt +++ b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt @@ -3,7 +3,6 @@ mysqli_change_user() - Prepared Statement --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt index 19c4e36375..184dd23aa6 100644 --- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt +++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt @@ -3,7 +3,6 @@ mysqli_change_user() - ROLLBACK --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) diff --git a/ext/mysqli/tests/mysqli_change_user_set_names.phpt b/ext/mysqli/tests/mysqli_change_user_set_names.phpt index bb2558b882..2a1d726fb4 100644 --- a/ext/mysqli/tests/mysqli_change_user_set_names.phpt +++ b/ext/mysqli/tests/mysqli_change_user_set_names.phpt @@ -3,7 +3,6 @@ mysqli_change_user() - SET NAMES --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index ee09719b64..a0d9c19928 100644 --- a/ext/mysqli/tests/mysqli_character_set.phpt +++ b/ext/mysqli/tests/mysqli_character_set.phpt @@ -4,7 +4,6 @@ Fetching results from tables of different charsets. <?php require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); -require_once('skipifemb.inc'); if (!function_exists('mysqli_set_charset')) { die('skip mysqli_set_charset() not available'); diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index b808a6b688..5728b726a5 100644 --- a/ext/mysqli/tests/mysqli_character_set_name.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name.phpt @@ -3,7 +3,6 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias] --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt index 843fefed31..fc5253a807 100644 --- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt @@ -3,7 +3,6 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias] --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt index 27cf9f0fc6..65b60367da 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt @@ -3,7 +3,6 @@ Interface of the class mysqli_driver --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt index 794f8eb241..48706fcf6e 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt @@ -3,7 +3,6 @@ Interface of the class mysqli --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt index fa7c7cd53d..a9d54c4367 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt @@ -3,7 +3,6 @@ Interface of the class mysqli --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt index 2c368abeb6..629697a50c 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt @@ -3,7 +3,6 @@ Interface of the class mysqli_result --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt index 8c79d35297..40666a65be 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt @@ -3,7 +3,6 @@ Interface of the class mysqli_stmt --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt index f11984d0ef..0aedb50bb2 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt @@ -3,7 +3,6 @@ Interface of the class mysqli_warning - TODO --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt index 98c934d49d..1f693a84d7 100644 --- a/ext/mysqli/tests/mysqli_close.phpt +++ b/ext/mysqli/tests/mysqli_close.phpt @@ -3,7 +3,6 @@ mysqli_close() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt index 351df66d94..2c29b02d48 100644 --- a/ext/mysqli/tests/mysqli_close_oo.phpt +++ b/ext/mysqli/tests/mysqli_close_oo.phpt @@ -3,7 +3,6 @@ mysqli_close() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt index 33bb2011cd..a85b962298 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -3,7 +3,6 @@ mysqli_commit() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt index 9ae81f9700..e2b8a25fd3 100644 --- a/ext/mysqli/tests/mysqli_commit_oo.phpt +++ b/ext/mysqli/tests/mysqli_commit_oo.phpt @@ -3,7 +3,6 @@ mysqli_commit() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt index a1372f3511..3668ad8f9e 100644 --- a/ext/mysqli/tests/mysqli_connect.phpt +++ b/ext/mysqli/tests/mysqli_connect.phpt @@ -3,7 +3,6 @@ mysqli_connect() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt index 2bc86de5cc..7e786e3d87 100644 --- a/ext/mysqli/tests/mysqli_connect_errno.phpt +++ b/ext/mysqli/tests/mysqli_connect_errno.phpt @@ -3,7 +3,6 @@ mysqli_connect_errno() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt index 6643ed27f0..801f18535e 100644 --- a/ext/mysqli/tests/mysqli_connect_error.phpt +++ b/ext/mysqli/tests/mysqli_connect_error.phpt @@ -3,7 +3,6 @@ mysqli_connect_error() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_connect_oo.phpt b/ext/mysqli/tests/mysqli_connect_oo.phpt index e39b4ac2da..8b0fcfbd2f 100644 --- a/ext/mysqli/tests/mysqli_connect_oo.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo.phpt @@ -3,7 +3,6 @@ new mysqli() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt index c5e65f7616..4893b6d134 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt @@ -3,7 +3,6 @@ new mysqli() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt index 5b410b746b..8b5886bba2 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt @@ -3,7 +3,6 @@ new mysqli() --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!get_current_user()) die('skip: get_current_user() not supported'); diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt index 6fa6746537..03c5fafeee 100644 --- a/ext/mysqli/tests/mysqli_connect_twice.phpt +++ b/ext/mysqli/tests/mysqli_connect_twice.phpt @@ -3,7 +3,6 @@ Calling connect() on an open connection to create a new connection --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt index 7087ca0fcd..22e3cd9d2b 100644 --- a/ext/mysqli/tests/mysqli_constants.phpt +++ b/ext/mysqli/tests/mysqli_constants.phpt @@ -3,7 +3,6 @@ Constants exported by ext/mysqli --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_constants_categories.phpt b/ext/mysqli/tests/mysqli_constants_categories.phpt index d02463e20a..29291fe203 100644 --- a/ext/mysqli/tests/mysqli_constants_categories.phpt +++ b/ext/mysqli/tests/mysqli_constants_categories.phpt @@ -3,7 +3,6 @@ Constants exported by ext/mysqli - checking category - PHP bug not mysqli bug (c --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); ?> --FILE-- <?php diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt index d467d3cf1a..d0fd769928 100644 --- a/ext/mysqli/tests/mysqli_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_data_seek.phpt @@ -3,7 +3,6 @@ mysqli_data_seek() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt index e945199d1b..1a60d64a98 100644 --- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt +++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt @@ -3,7 +3,6 @@ mysqli_result->data_seek() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_debug.phpt b/ext/mysqli/tests/mysqli_debug.phpt index c701d765c2..14c95c2de3 100644 --- a/ext/mysqli/tests/mysqli_debug.phpt +++ b/ext/mysqli/tests/mysqli_debug.phpt @@ -3,7 +3,6 @@ mysqli_debug() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_debug')) diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt index e75639e89d..b246fed9e2 100644 --- a/ext/mysqli/tests/mysqli_debug_append.phpt +++ b/ext/mysqli/tests/mysqli_debug_append.phpt @@ -3,7 +3,6 @@ mysqli_debug() - append to trace file --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_debug')) diff --git a/ext/mysqli/tests/mysqli_debug_control_string.phpt b/ext/mysqli/tests/mysqli_debug_control_string.phpt index 474f0998f6..7a59c7b4e0 100644 --- a/ext/mysqli/tests/mysqli_debug_control_string.phpt +++ b/ext/mysqli/tests/mysqli_debug_control_string.phpt @@ -3,7 +3,6 @@ mysqli_debug() - invalid debug control strings --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_debug')) diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt index 3416e9a9e2..6afea2f866 100644 --- a/ext/mysqli/tests/mysqli_debug_ini.phpt +++ b/ext/mysqli/tests/mysqli_debug_ini.phpt @@ -3,7 +3,6 @@ mysqli_debug() - enabling trace with ini setting --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_debug')) diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt index 957ac9b573..5e2be2ac5d 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt @@ -3,7 +3,6 @@ mysqli_debug() - all control string options supported by both mysqlnd and libmys --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_debug')) diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt index a6d5d08146..a99df69359 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt @@ -3,7 +3,6 @@ mysqli_debug() - mysqlnd only control strings --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt index 92b4e8fc27..fe51b6141d 100644 --- a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt @@ -3,7 +3,6 @@ mysqli_disable_reads_from_master() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_disable_reads_from_master')) { diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt index d4fa124a59..9af4f22f1f 100644 --- a/ext/mysqli/tests/mysqli_driver.phpt +++ b/ext/mysqli/tests/mysqli_driver.phpt @@ -3,7 +3,6 @@ mysqli_driver class --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_dump_debug_info.phpt b/ext/mysqli/tests/mysqli_dump_debug_info.phpt index 18399ee8a6..8b97304bc6 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info.phpt @@ -3,7 +3,6 @@ mysqli_dump_debug_info() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt index ae153a320a..7fb7ba7963 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt @@ -3,7 +3,6 @@ mysqli_dump_debug_info() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_embedded_connect.phpt b/ext/mysqli/tests/mysqli_embedded_connect.phpt deleted file mode 100644 index aa970aaf74..0000000000 --- a/ext/mysqli/tests/mysqli_embedded_connect.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -mysqli_embedded_connect() ---SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifnotemb.inc'); -require_once('skipifconnectfailure.inc'); -?> ---FILE-- -<?php - require_once("connect.inc"); - $tmp = NULL; - $link = NULL; - - if (NULL !== ($tmp = @mysqli_embedded_connect())) - printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); - - if (!$link = mysqli_embedded_connect($db)) { - printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", - $host, $user, $db, $port, $socket); - } - - if (!is_bool($tmp = mysqli_embedded_connect($db . '_unknown'))) - printf("[003] Expecting boolean/[true|false] value, got %s/%s\n", gettype($tmp), $tmp); - - mysqli_close($link); - - print "done!"; -?> ---EXPECTF-- -Warning: mysqli_embedded_connect(): Argument #1 must be of type mysqli, null given in %s on line %d -done! diff --git a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt index 0365b14e75..d6e3088bc2 100644 --- a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt @@ -3,7 +3,6 @@ mysqli_enable_reads_from_master() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_enable_reads_from_master')) { diff --git a/ext/mysqli/tests/mysqli_errno.phpt b/ext/mysqli/tests/mysqli_errno.phpt index 2cfb17fde3..fe2493a04f 100644 --- a/ext/mysqli/tests/mysqli_errno.phpt +++ b/ext/mysqli/tests/mysqli_errno.phpt @@ -3,7 +3,6 @@ mysqli_errno() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_errno_oo.phpt b/ext/mysqli/tests/mysqli_errno_oo.phpt index d35477b2c4..d2dab3cec0 100644 --- a/ext/mysqli/tests/mysqli_errno_oo.phpt +++ b/ext/mysqli/tests/mysqli_errno_oo.phpt @@ -3,7 +3,6 @@ $mysqli->errno --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_error.phpt b/ext/mysqli/tests/mysqli_error.phpt index 7a35cd0dd1..91b2f715a1 100644 --- a/ext/mysqli/tests/mysqli_error.phpt +++ b/ext/mysqli/tests/mysqli_error.phpt @@ -3,7 +3,6 @@ mysqli_error() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_error_oo.phpt b/ext/mysqli/tests/mysqli_error_oo.phpt index 177e3a9f5a..d690a61995 100644 --- a/ext/mysqli/tests/mysqli_error_oo.phpt +++ b/ext/mysqli/tests/mysqli_error_oo.phpt @@ -3,7 +3,6 @@ $mysqli->error --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt index bea05179ea..1da3f5fd69 100644 --- a/ext/mysqli/tests/mysqli_error_unicode.phpt +++ b/ext/mysqli/tests/mysqli_error_unicode.phpt @@ -3,7 +3,6 @@ mysqli_error() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_expire_password.phpt b/ext/mysqli/tests/mysqli_expire_password.phpt index 18517e521a..788a3571c5 100644 --- a/ext/mysqli/tests/mysqli_expire_password.phpt +++ b/ext/mysqli/tests/mysqli_expire_password.phpt @@ -3,7 +3,6 @@ MySQL 5.6 EXPIRE PASSWORD protocol change --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('connect.inc'); if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt index 91ef498c62..45a567dd9f 100644 --- a/ext/mysqli/tests/mysqli_explain_metadata.phpt +++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt @@ -3,7 +3,6 @@ EXPLAIN - metadata --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); if (!$IS_MYSQLND) diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index ab48821498..7c962790c6 100644 --- a/ext/mysqli/tests/mysqli_fetch_all.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all.phpt @@ -3,7 +3,6 @@ mysqli_fetch_all() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_fetch_all')) die("skip: function only available with mysqlnd"); diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index 2b34670756..ff56ad1a9e 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -3,7 +3,6 @@ $mysqli->fetch_all() (introduced with mysqlnd) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_fetch_all')) diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt index ce7053cfe1..c2046f1821 100644 --- a/ext/mysqli/tests/mysqli_fetch_array.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array.phpt @@ -3,7 +3,6 @@ mysqli_fetch_array() - all datatypes but BIT --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index 6899c0bfba..defa5a541e 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt @@ -3,7 +3,6 @@ mysqli_fetch_array() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt index 5f86e3739a..33330074df 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt @@ -3,7 +3,6 @@ mysqli_fetch_array() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt index 4ef3281203..e4e39b9dc7 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt @@ -3,7 +3,6 @@ mysqli->fetch_array() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt index 5372d6f1de..62f2bf05e4 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt @@ -3,7 +3,6 @@ mysqli_fetch_assoc() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt index 1116c38d45..cc60a01b83 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt @@ -3,7 +3,6 @@ mysqli_fetch_assoc() - BIT --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt index a581499daa..7083f54b4a 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt @@ -3,7 +3,6 @@ mysqli_fetch_assoc() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt index e1ed5c5c87..d74fb48270 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt @@ -3,7 +3,6 @@ mysqli_fetch_assoc() - utf8 --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt index db07a2ef4b..b3c218b280 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -3,7 +3,6 @@ mysqli_fetch_assoc() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt index b06124a89c..b6968ccbae 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt @@ -3,7 +3,6 @@ mysqli_fetch_assoc() - ZEROFILL --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt index 33a35c7005..f70f422534 100644 --- a/ext/mysqli/tests/mysqli_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field.phpt @@ -3,7 +3,6 @@ mysqli_fetch_field() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt index 8b57cca094..b8544d87f4 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt @@ -3,7 +3,6 @@ mysqli_fetch_field_direct() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt index 5dedefcdab..9c79925701 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt @@ -3,7 +3,6 @@ $res->fetch_field_direct(s) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index 5983075942..14ca304aa4 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -3,7 +3,6 @@ mysqli_fetch_field() - flags/field->flags --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt index 4a10ced2c2..c5aa09c109 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt @@ -3,7 +3,6 @@ mysqli_fetch_field() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt index 70152212e3..074d9ccd1c 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt @@ -3,7 +3,6 @@ mysqli_fetch_field() - data types/field->type --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt index 5a16f73633..114029ac10 100644 --- a/ext/mysqli/tests/mysqli_fetch_fields.phpt +++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt @@ -3,7 +3,6 @@ mysqli_fetch_fields() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt index 707c3691d0..371b300b17 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt @@ -3,7 +3,6 @@ mysqli_fetch_lengths() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt index 18cc383939..1de60e0363 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt @@ -3,7 +3,6 @@ mysqli_result->lengths --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt index 221ad6ab3d..443b2663c7 100644 --- a/ext/mysqli/tests/mysqli_fetch_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object.phpt @@ -3,7 +3,6 @@ mysqli_fetch_object() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt index f773b76528..9aac03195b 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt @@ -3,7 +3,6 @@ mysqli_fetch_object() - calling constructor on class wo constructor --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt index c12b91e68e..75e62fd940 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt @@ -3,7 +3,6 @@ mysqli_fetch_object() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt index 18aeb264ec..674c68a4fd 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -3,7 +3,6 @@ mysqli_fetch_object() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt index ef52b5a48c..a1a891d702 100644 --- a/ext/mysqli/tests/mysqli_fetch_row.phpt +++ b/ext/mysqli/tests/mysqli_fetch_row.phpt @@ -3,7 +3,6 @@ mysqli_fetch_row() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt index fd2549ecb2..26d1b8b108 100644 --- a/ext/mysqli/tests/mysqli_field_count.phpt +++ b/ext/mysqli/tests/mysqli_field_count.phpt @@ -3,7 +3,6 @@ mysqli_field_count() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt index d4f160deb0..1f5a6ee8fb 100644 --- a/ext/mysqli/tests/mysqli_field_seek.phpt +++ b/ext/mysqli/tests/mysqli_field_seek.phpt @@ -3,7 +3,6 @@ mysqli_field_seek() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt index 1a2be4d70c..3575d17d8b 100644 --- a/ext/mysqli/tests/mysqli_field_tell.phpt +++ b/ext/mysqli/tests/mysqli_field_tell.phpt @@ -3,7 +3,6 @@ mysqli_field_tell() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index af9f8a1f24..594e30178e 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -3,7 +3,6 @@ Forking a child and using the same connection. --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('pcntl_fork')) diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt index e0f0fce781..3956021615 100644 --- a/ext/mysqli/tests/mysqli_free_result.phpt +++ b/ext/mysqli/tests/mysqli_free_result.phpt @@ -3,7 +3,6 @@ mysqli_free_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_get_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt index 4c253ec551..88aa0e471d 100644 --- a/ext/mysqli/tests/mysqli_get_charset.phpt +++ b/ext/mysqli/tests/mysqli_get_charset.phpt @@ -3,7 +3,6 @@ mysqli_get_charset() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_get_charset')) die("skip: function not available"); diff --git a/ext/mysqli/tests/mysqli_get_client_info.phpt b/ext/mysqli/tests/mysqli_get_client_info.phpt index 41b0870b37..221ce14902 100644 --- a/ext/mysqli/tests/mysqli_get_client_info.phpt +++ b/ext/mysqli/tests/mysqli_get_client_info.phpt @@ -3,7 +3,6 @@ mysqli_get_client_info() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt index 49fd7470d6..9ef1cc4448 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt @@ -3,7 +3,6 @@ mysqli_get_client_stats() --SKIPIF-- <?PHP require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_get_client_stats')) { die("skip only available with mysqlnd"); diff --git a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt index bbf3d702c9..ec4ebe7cfb 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt @@ -3,7 +3,6 @@ mysqli_get_client_stats() - implicit_free_result --SKIPIF-- <?PHP require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_get_client_stats')) { die("skip only available with mysqlnd"); diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt index cd713fbc9b..6cd49a2c15 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt @@ -3,7 +3,6 @@ mysqli_get_client_stats() - php_ini setting --SKIPIF-- <?PHP require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_get_client_stats')) { die("skip only available with mysqlnd"); diff --git a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt index ef9042b5a3..c9107115d3 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt @@ -3,7 +3,6 @@ mysqli_get_client_stats() - PS --SKIPIF-- <?PHP require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_get_client_stats')) { die("skip only available with mysqlnd"); diff --git a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt index f5b03996b8..0e7f57bab1 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt @@ -6,7 +6,6 @@ mysqlnd.collect_memory_statistics="1" --SKIPIF-- <?PHP require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_get_client_stats')) { die("skip only available with mysqlnd"); diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt index 8f1ffb52c9..24e871bf14 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt @@ -6,7 +6,6 @@ mysqlnd.collect_memory_statistics="1" --SKIPIF-- <?PHP require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_get_connection_stats')) { die("skip only available with mysqlnd"); diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt index 9dcfbe795c..8002c045bf 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt @@ -6,7 +6,6 @@ mysqlnd.collect_memory_statistics="0" --SKIPIF-- <?PHP require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_get_connection_stats')) { die("skip only available with mysqlnd"); diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt index 072ebc87ad..a26daa9ce1 100644 --- a/ext/mysqli/tests/mysqli_get_host_info.phpt +++ b/ext/mysqli/tests/mysqli_get_host_info.phpt @@ -3,7 +3,6 @@ mysqli_get_host_info() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt index 2eeae3d03a..0091993d21 100644 --- a/ext/mysqli/tests/mysqli_get_proto_info.phpt +++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt @@ -3,7 +3,6 @@ mysqli_get_proto_info() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt index 3a1e08e029..33e816f2e8 100644 --- a/ext/mysqli/tests/mysqli_get_server_info.phpt +++ b/ext/mysqli/tests/mysqli_get_server_info.phpt @@ -3,7 +3,6 @@ mysqli_get_server_info() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt index c249d70885..b28bd8f285 100644 --- a/ext/mysqli/tests/mysqli_get_server_version.phpt +++ b/ext/mysqli/tests/mysqli_get_server_version.phpt @@ -3,7 +3,6 @@ mysqli_get_server_version() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt index 20b2607f39..23356db4e6 100644 --- a/ext/mysqli/tests/mysqli_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_get_warnings.phpt @@ -3,7 +3,6 @@ mysqli_get_warnings() - TODO --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) diff --git a/ext/mysqli/tests/mysqli_info.phpt b/ext/mysqli/tests/mysqli_info.phpt index e0736701ac..4fe156ba31 100644 --- a/ext/mysqli/tests/mysqli_info.phpt +++ b/ext/mysqli/tests/mysqli_info.phpt @@ -3,7 +3,6 @@ mysqli_info() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt index c8f3ac8ec5..56a956900a 100644 --- a/ext/mysqli/tests/mysqli_init.phpt +++ b/ext/mysqli/tests/mysqli_init.phpt @@ -3,7 +3,6 @@ mysqli_init() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_insert_id.phpt b/ext/mysqli/tests/mysqli_insert_id.phpt index a9fc31998d..431be0d293 100644 --- a/ext/mysqli/tests/mysqli_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_insert_id.phpt @@ -3,7 +3,6 @@ mysqli_insert_id() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt index e4be618fc7..563a6ba19c 100644 --- a/ext/mysqli/tests/mysqli_kill.phpt +++ b/ext/mysqli/tests/mysqli_kill.phpt @@ -3,7 +3,6 @@ mysqli_kill() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_max_links.phpt b/ext/mysqli/tests/mysqli_max_links.phpt index 5dd7be9dcc..21405199e5 100644 --- a/ext/mysqli/tests/mysqli_max_links.phpt +++ b/ext/mysqli/tests/mysqli_max_links.phpt @@ -3,7 +3,6 @@ Testing mysqli.max_links --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt index 5963934b84..36a477fcf3 100644 --- a/ext/mysqli/tests/mysqli_more_results.phpt +++ b/ext/mysqli/tests/mysqli_more_results.phpt @@ -3,7 +3,6 @@ mysqli_more_results() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt index 5f29dc6f6a..843298140b 100644 --- a/ext/mysqli/tests/mysqli_multi_query.phpt +++ b/ext/mysqli/tests/mysqli_multi_query.phpt @@ -3,7 +3,6 @@ mysqli_multi_query() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt index 3825cd6bd8..403662829a 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt @@ -3,7 +3,6 @@ mysqlnd.net_read_timeout > default_socket_timeout --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$IS_MYSQLND) { diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt index 9d1e316573..011df0e762 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt @@ -3,7 +3,6 @@ mysqlnd.net_read_timeout = 0 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$IS_MYSQLND) { diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt index 090326dfa8..62b743014f 100644 --- a/ext/mysqli/tests/mysqli_next_result.phpt +++ b/ext/mysqli/tests/mysqli_next_result.phpt @@ -3,7 +3,6 @@ mysqli_next_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_no_reconnect.phpt b/ext/mysqli/tests/mysqli_no_reconnect.phpt index 1f7ca8d834..5d54b02a2b 100644 --- a/ext/mysqli/tests/mysqli_no_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_no_reconnect.phpt @@ -3,7 +3,6 @@ Trying implicit reconnect after wait_timeout and KILL using mysqli_ping() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt index df2161f685..e1d61cf785 100644 --- a/ext/mysqli/tests/mysqli_num_fields.phpt +++ b/ext/mysqli/tests/mysqli_num_fields.phpt @@ -3,7 +3,6 @@ mysqli_num_fields() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt index 16b3aacd80..04a5dec59a 100644 --- a/ext/mysqli/tests/mysqli_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_num_rows.phpt @@ -3,7 +3,6 @@ mysqli_num_rows() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_open_bug74432.phpt b/ext/mysqli/tests/mysqli_open_bug74432.phpt index 9d529925e9..cb5d00a1e4 100644 --- a/ext/mysqli/tests/mysqli_open_bug74432.phpt +++ b/ext/mysqli/tests/mysqli_open_bug74432.phpt @@ -3,7 +3,6 @@ Bug #74432, BC issue on undocumented connect string --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt index bec663a64a..ad129a41bb 100644 --- a/ext/mysqli/tests/mysqli_options.phpt +++ b/ext/mysqli/tests/mysqli_options.phpt @@ -3,7 +3,6 @@ mysqli_options() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt index 35e98e7e47..089f230538 100644 --- a/ext/mysqli/tests/mysqli_options_init_command.phpt +++ b/ext/mysqli/tests/mysqli_options_init_command.phpt @@ -3,7 +3,6 @@ mysqli_options() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> <?php require_once('skipifemb.inc'); ?> diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt index 8f81d4a3e4..91bd38553c 100644 --- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt +++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt @@ -3,7 +3,6 @@ mysqli_options() - MYSQLI_OPT_INT_AND_FLOAT_NATIVE --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_options_openbasedir.phpt b/ext/mysqli/tests/mysqli_options_openbasedir.phpt index 52dc03296d..5fd213c108 100644 --- a/ext/mysqli/tests/mysqli_options_openbasedir.phpt +++ b/ext/mysqli/tests/mysqli_options_openbasedir.phpt @@ -3,7 +3,6 @@ mysqli_options() - MYSQLI_OPT_LOCAL_INFILE and open_basedir --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt index 2085ab135a..5d9591e0dc 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256.phpt @@ -3,7 +3,6 @@ PAM: SHA-256 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ob_start(); diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt index 5620d4f4e7..7799effe22 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt @@ -3,7 +3,6 @@ PAM: SHA-256, mysqlnd.sha256_server_public_key --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ob_start(); diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt index e0c25d607f..e6c65bef9d 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt @@ -3,7 +3,6 @@ PAM: SHA-256, option: MYSQLI_SERVER_PUBLIC_KEY --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ob_start(); diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt index 8e8121f6e7..2397c82cac 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt @@ -3,7 +3,6 @@ PAM: SHA-256, option: MYSQLI_SERVER_PUBLIC_KEY (invalid) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ob_start(); diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt index a68a6bb339..1a358cceaa 100644 --- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt +++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt @@ -3,7 +3,6 @@ Calling connect() on an open persistent connection to create a new persistent co --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_pconn_disabled.phpt b/ext/mysqli/tests/mysqli_pconn_disabled.phpt index a59a43cbd5..8320e25036 100644 --- a/ext/mysqli/tests/mysqli_pconn_disabled.phpt +++ b/ext/mysqli/tests/mysqli_pconn_disabled.phpt @@ -3,7 +3,6 @@ mysqli_pconnect() - mysqli.allow_persistent = 0 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); die("skip TODO - we need to add a user level way to check if CHANGE_USER gets called by pconnect"); diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt index abf2c838f8..1415ee4ac6 100644 --- a/ext/mysqli/tests/mysqli_pconn_kill.phpt +++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt @@ -3,7 +3,6 @@ Killing a persistent connection. --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); ?> diff --git a/ext/mysqli/tests/mysqli_pconn_limits.phpt b/ext/mysqli/tests/mysqli_pconn_limits.phpt index b00b99883a..c78fda1a01 100644 --- a/ext/mysqli/tests/mysqli_pconn_limits.phpt +++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt @@ -3,7 +3,6 @@ Persistent connections - limits (-1, unlimited) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); ?> diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt index a4f7558214..f6ee6aa5a0 100644 --- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt +++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt @@ -3,7 +3,6 @@ Persistent connections and mysqli.max_links --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('table.inc'); diff --git a/ext/mysqli/tests/mysqli_pconn_reuse.phpt b/ext/mysqli/tests/mysqli_pconn_reuse.phpt index 89600c48d9..4f1dff27e8 100644 --- a/ext/mysqli/tests/mysqli_pconn_reuse.phpt +++ b/ext/mysqli/tests/mysqli_pconn_reuse.phpt @@ -5,7 +5,6 @@ mysqli_pconnect() - reusing/caching persistent connections - TODO die("skip TODO - we need to add a user level way to check if CHANGE_USER gets called by pconnect"); require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt index e388847507..343c5f2e8a 100644 --- a/ext/mysqli/tests/mysqli_pconn_twice.phpt +++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt @@ -3,7 +3,6 @@ Calling connect() on an open persistent connection to create a new persistent co --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt index 16fbb27e31..2fce478853 100644 --- a/ext/mysqli/tests/mysqli_pconnect.phpt +++ b/ext/mysqli/tests/mysqli_pconnect.phpt @@ -3,7 +3,6 @@ mysqli_pconnect() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_phpinfo.phpt b/ext/mysqli/tests/mysqli_phpinfo.phpt index d1ecdea796..fd0edd4463 100644 --- a/ext/mysqli/tests/mysqli_phpinfo.phpt +++ b/ext/mysqli/tests/mysqli_phpinfo.phpt @@ -3,7 +3,6 @@ phpinfo() mysqli section --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_ping.phpt b/ext/mysqli/tests/mysqli_ping.phpt index 40a3115f3d..e4d184c621 100644 --- a/ext/mysqli/tests/mysqli_ping.phpt +++ b/ext/mysqli/tests/mysqli_ping.phpt @@ -3,7 +3,6 @@ mysqli_ping() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_poll.phpt b/ext/mysqli/tests/mysqli_poll.phpt index cc3cc36b2f..d5527fcf02 100644 --- a/ext/mysqli/tests/mysqli_poll.phpt +++ b/ext/mysqli/tests/mysqli_poll.phpt @@ -3,7 +3,6 @@ int mysqli_poll() simple --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('connect.inc'); require_once('skipifconnectfailure.inc'); diff --git a/ext/mysqli/tests/mysqli_poll_kill.phpt b/ext/mysqli/tests/mysqli_poll_kill.phpt index c796c06c70..8ac3dc2bd1 100644 --- a/ext/mysqli/tests/mysqli_poll_kill.phpt +++ b/ext/mysqli/tests/mysqli_poll_kill.phpt @@ -3,7 +3,6 @@ int mysqli_poll() and kill --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('connect.inc'); require_once('skipifconnectfailure.inc'); diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt index a52c2355d5..1813a72a27 100644 --- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt +++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt @@ -3,7 +3,6 @@ mysqli_poll() & INSERT SELECT --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('connect.inc'); require_once('skipifconnectfailure.inc'); diff --git a/ext/mysqli/tests/mysqli_poll_reference.phpt b/ext/mysqli/tests/mysqli_poll_reference.phpt index 6aaa180dbe..bf79c13a27 100644 --- a/ext/mysqli/tests/mysqli_poll_reference.phpt +++ b/ext/mysqli/tests/mysqli_poll_reference.phpt @@ -3,7 +3,6 @@ mysqli_poll() & references --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('connect.inc'); require_once('skipifconnectfailure.inc'); diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt index 7c2ab21d6b..16d208efcc 100644 --- a/ext/mysqli/tests/mysqli_prepare.phpt +++ b/ext/mysqli/tests/mysqli_prepare.phpt @@ -3,7 +3,6 @@ mysqli_prepare() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt index 2b6a07d2ac..42021b1b88 100644 --- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt +++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt @@ -3,7 +3,6 @@ mysqli_prepare() - no object on failure --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt index 8467690776..f13254b449 100644 --- a/ext/mysqli/tests/mysqli_ps_select_union.phpt +++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt @@ -3,7 +3,6 @@ Prepared Statements and SELECT UNION --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt index b291306faf..b3269689c1 100644 --- a/ext/mysqli/tests/mysqli_query.phpt +++ b/ext/mysqli/tests/mysqli_query.phpt @@ -3,7 +3,6 @@ mysqli_query() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_query_iterators.phpt b/ext/mysqli/tests/mysqli_query_iterators.phpt index 199cddbcc5..cb567affc2 100644 --- a/ext/mysqli/tests/mysqli_query_iterators.phpt +++ b/ext/mysqli/tests/mysqli_query_iterators.phpt @@ -3,7 +3,6 @@ mysqli iterators --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt index 0cec3b398a..6959346107 100644 --- a/ext/mysqli/tests/mysqli_query_unicode.phpt +++ b/ext/mysqli/tests/mysqli_query_unicode.phpt @@ -3,7 +3,6 @@ mysqli_query() - unicode (cyrillic) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); require_once('table.inc'); diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt index 05aeca1f6f..f580037844 100644 --- a/ext/mysqli/tests/mysqli_real_connect.phpt +++ b/ext/mysqli/tests/mysqli_real_connect.phpt @@ -3,7 +3,6 @@ mysqli_real_connect() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt index 121504a8fd..a7245e384e 100644 --- a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt +++ b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt @@ -3,7 +3,6 @@ mysqli_real_connect() - persistent connections --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); if (!$IS_MYSQLND) diff --git a/ext/mysqli/tests/mysqli_real_escape_string.phpt b/ext/mysqli/tests/mysqli_real_escape_string.phpt index 185d245dcc..5e6c7d9130 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string.phpt @@ -3,7 +3,6 @@ mysqli_real_escape_string() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt index 97113b858e..e6b60997c9 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt @@ -4,7 +4,6 @@ mysqli_real_escape_string() - big5 <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt index 7d51309346..34c4faa98a 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt @@ -4,7 +4,6 @@ mysqli_real_escape_string() - eucjpms <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt index 21c3f99736..c9482cc6e1 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt @@ -4,7 +4,6 @@ mysqli_real_escape_string() - euckr <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt index 505c0bfa6c..d85649757e 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt @@ -4,7 +4,6 @@ mysqli_real_escape_string() - gb2312 <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt index 3dd8c84a58..2f08d5c37f 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt @@ -3,7 +3,6 @@ mysqli_real_escape_string() - gbk --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt index b8e48ccf8f..b48e9c02d8 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt @@ -3,7 +3,6 @@ mysqli_real_escape_string() - SQL Mode NO_BACKSLASH_ESCAPE --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt index 611590af27..c577215357 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt @@ -3,7 +3,6 @@ mysqli_real_escape_string() - sjis --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt index acbbc4ed85..78a3ece11b 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt @@ -3,7 +3,6 @@ mysqli_real_escape_string() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_reap_async_query.phpt b/ext/mysqli/tests/mysqli_reap_async_query.phpt index 8f9fd5cb1c..223befe9bc 100644 --- a/ext/mysqli/tests/mysqli_reap_async_query.phpt +++ b/ext/mysqli/tests/mysqli_reap_async_query.phpt @@ -3,7 +3,6 @@ mysqli_reap_async_query() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('connect.inc'); require_once('skipifconnectfailure.inc'); diff --git a/ext/mysqli/tests/mysqli_reconnect.phpt b/ext/mysqli/tests/mysqli_reconnect.phpt index 0ad110f0df..dde2d7c261 100644 --- a/ext/mysqli/tests/mysqli_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_reconnect.phpt @@ -3,7 +3,6 @@ Trying implicit reconnect after wait_timeout and KILL using mysqli_ping() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (stristr(mysqli_get_client_info(), 'mysqlnd')) die("skip: test for libmysql"); diff --git a/ext/mysqli/tests/mysqli_release_savepoint.phpt b/ext/mysqli/tests/mysqli_release_savepoint.phpt index 76afa7a312..cbadb8a95c 100644 --- a/ext/mysqli/tests/mysqli_release_savepoint.phpt +++ b/ext/mysqli/tests/mysqli_release_savepoint.phpt @@ -3,7 +3,6 @@ mysqli_release_savepoint() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt index 6f5733513c..4ad70a4eb9 100644 --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@ -3,7 +3,6 @@ mysqli_report() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_report_new.phpt b/ext/mysqli/tests/mysqli_report_new.phpt index 5bfa260c9e..af951739c2 100644 --- a/ext/mysqli/tests/mysqli_report_new.phpt +++ b/ext/mysqli/tests/mysqli_report_new.phpt @@ -3,7 +3,6 @@ mysqli_report(), change user, MySQL 5.6+ --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt index 683c46c8f6..7103adfdb2 100644 --- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt +++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt @@ -3,7 +3,6 @@ mysqli_report(), MySQL < 5.6 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) diff --git a/ext/mysqli/tests/mysqli_result_invalid_mode.phpt b/ext/mysqli/tests/mysqli_result_invalid_mode.phpt index 374fccfa61..938f6e65dc 100644 --- a/ext/mysqli/tests/mysqli_result_invalid_mode.phpt +++ b/ext/mysqli/tests/mysqli_result_invalid_mode.phpt @@ -3,7 +3,6 @@ mysqli_result(), invalid mode --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt index 7084955380..f917d00ed3 100644 --- a/ext/mysqli/tests/mysqli_result_references.phpt +++ b/ext/mysqli/tests/mysqli_result_references.phpt @@ -3,7 +3,6 @@ References to result sets --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt index d33c89b4dc..a5c68ca73f 100644 --- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt @@ -3,7 +3,6 @@ References to result sets - mysqlnd (no copies but references) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt index 06f7d5899d..5962c583eb 100644 --- a/ext/mysqli/tests/mysqli_result_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt @@ -3,7 +3,6 @@ Trying to clone mysqli_result object --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt index 92ab3e28b5..51060d6287 100644 --- a/ext/mysqli/tests/mysqli_rollback.phpt +++ b/ext/mysqli/tests/mysqli_rollback.phpt @@ -3,7 +3,6 @@ mysqli_rollback() --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_savepoint.phpt b/ext/mysqli/tests/mysqli_savepoint.phpt index 1001625667..b3b616a70e 100644 --- a/ext/mysqli/tests/mysqli_savepoint.phpt +++ b/ext/mysqli/tests/mysqli_savepoint.phpt @@ -3,7 +3,6 @@ mysqli_savepoint() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt index 67716d0664..50463b8106 100644 --- a/ext/mysqli/tests/mysqli_select_db.phpt +++ b/ext/mysqli/tests/mysqli_select_db.phpt @@ -3,7 +3,6 @@ mysqli_select_db() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_send_query.phpt b/ext/mysqli/tests/mysqli_send_query.phpt index cf271c5d07..4e257bd0a1 100644 --- a/ext/mysqli/tests/mysqli_send_query.phpt +++ b/ext/mysqli/tests/mysqli_send_query.phpt @@ -3,7 +3,6 @@ mysqli_send_query() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_send_query')) { die("skip mysqli_send_query() not available"); diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt index 43b8be3f00..cd30913661 100644 --- a/ext/mysqli/tests/mysqli_set_charset.phpt +++ b/ext/mysqli/tests/mysqli_set_charset.phpt @@ -3,7 +3,6 @@ mysqli_set_charset() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_set_charset')) diff --git a/ext/mysqli/tests/mysqli_set_opt.phpt b/ext/mysqli/tests/mysqli_set_opt.phpt index c0e55dd5d6..4fc4735b33 100644 --- a/ext/mysqli/tests/mysqli_set_opt.phpt +++ b/ext/mysqli/tests/mysqli_set_opt.phpt @@ -3,7 +3,6 @@ mysqli_set_opt() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_sqlstate.phpt b/ext/mysqli/tests/mysqli_sqlstate.phpt index cf60977763..d827282809 100644 --- a/ext/mysqli/tests/mysqli_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_sqlstate.phpt @@ -3,7 +3,6 @@ mysqli_sqlstate() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt index 7f079f21ea..6ccfb4359d 100644 --- a/ext/mysqli/tests/mysqli_ssl_set.phpt +++ b/ext/mysqli/tests/mysqli_ssl_set.phpt @@ -3,7 +3,6 @@ mysqli_ssl_set() - test is a stub! --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_ssl_set')) die("skip function not available"); diff --git a/ext/mysqli/tests/mysqli_stat.phpt b/ext/mysqli/tests/mysqli_stat.phpt index dd0b3d24c9..73a7656e1f 100644 --- a/ext/mysqli/tests/mysqli_stat.phpt +++ b/ext/mysqli/tests/mysqli_stat.phpt @@ -3,7 +3,6 @@ mysqli_stat() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt index 505acc68f1..e3cf5dcbbc 100644 --- a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt @@ -3,7 +3,6 @@ mysqli_stmt_affected_rows() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt index ec3cf3d8d0..5c246aaff8 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt @@ -3,7 +3,6 @@ mysqli_stmt_attr_get() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt index 2781810d9b..80956e854f 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt @@ -3,7 +3,6 @@ mysqli_stmt_attr_get() - prefetch --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); die("SKIP: prefetch isn't supported at the moment"); ?> diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt index 6e4267e6fb..a22704af50 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt @@ -3,7 +3,6 @@ mysqli_stmt_attr_set() - mysqlnd does not check for invalid codes --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt index afc34c27b4..9479d233a9 100644 --- a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt @@ -3,7 +3,6 @@ mysqli_stmt_prepare() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt index 44ab45c257..f9eca0f333 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt @@ -3,7 +3,6 @@ Bind limits --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt index a12e01dc42..9345bb5a0e 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_param() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt index 3de2910fd4..e1e600229c 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_param used with call_user_func_array() (see also bug #43568) --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt index 4b243ef3d6..9b70f23639 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_param() - checking whether the parameters are modified (bug#443 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt index efe86972d9..137670235a 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_param() - Binding with very high number of columns --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt index f05e46fe9d..38f2533625 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_param() - playing with references --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt index 5a8dd90577..b69dfe686e 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_param() - binding variable twice --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt index f9556ad0f6..99f2c8ef77 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt index 39a2f503f8..ecad139353 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt index 62a3e499ae..ae778472ed 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt @@ -3,7 +3,6 @@ Playing with SELECT FORMAT(...) AS _format - see also bugs.php.net/42378 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt index 8040f35bca..05e75f7e23 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_result() - playing with references --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt index f1a68e3c0e..a49d0d0ed9 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt @@ -3,7 +3,6 @@ mysqli_stmt_bind_result() - ZEROFILL --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt index fd91eaecd1..dd27da85ab 100644 --- a/ext/mysqli/tests/mysqli_stmt_close.phpt +++ b/ext/mysqli/tests/mysqli_stmt_close.phpt @@ -3,7 +3,6 @@ mysqli_stmt_close() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt index 5594600747..ffd5960c06 100644 --- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt @@ -3,7 +3,6 @@ mysqli_stmt_data_seek() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index 4bffb7cab7..2f18c6371f 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -3,7 +3,6 @@ Playing with datatype change between prepare and execute --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt index 9928d0c1f3..b5d741cd6e 100644 --- a/ext/mysqli/tests/mysqli_stmt_errno.phpt +++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt @@ -3,7 +3,6 @@ mysqli_stmt_errno() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt index 98e6102655..c8012b3434 100644 --- a/ext/mysqli/tests/mysqli_stmt_error.phpt +++ b/ext/mysqli/tests/mysqli_stmt_error.phpt @@ -3,7 +3,6 @@ mysqli_stmt_error() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt index d3f404aa3d..1d1307e4b9 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt @@ -3,7 +3,6 @@ mysqli_stmt_execute() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error())); diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt index 4dce9dfefa..b99a326323 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt @@ -3,7 +3,6 @@ mysqli_stmt_fetch() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt index 3cbe8e4ee2..87757dcaa9 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt @@ -3,7 +3,6 @@ Fetching BIT column values using the PS API --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); require_once('table.inc'); diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt index fe5d2f3799..086f4e08d8 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt @@ -3,7 +3,6 @@ mysqli_stmt_fetch_fields() unicode, win32 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt index 8c87199602..3d177d903d 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt @@ -3,7 +3,6 @@ mysqli_stmt_fetch - geometry / spatial types --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!defined("MYSQLI_TYPE_GEOMETRY")) diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt index 5c725cd063..939b3fcf5d 100644 --- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt @@ -3,7 +3,6 @@ mysqli_stmt_field_counts() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt index b43afce5c9..833970a8b5 100644 --- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt @@ -3,7 +3,6 @@ mysqli_stmt_free_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index 09c63ab7f8..ca0b1ed036 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt index bbcb926c01..2daa325b75 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) die('skip mysqli_stmt_get_result not available'); diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt index e86bde9361..c9e00a793d 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt @@ -3,7 +3,6 @@ Fetching BIT column values using the PS API --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt index 2d58ca20d3..ec313f06aa 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result() - meta data, field_count() --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt index 9b8369a7ca..51d2875c96 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result - geometry / spatial types --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index 9e6ddec044..f3810019c4 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result() - meta data --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt index 1c5d3ecbc7..0db422c030 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result() - meta data, field info --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt index 23254e1755..f86b7c6b79 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result() - SHOW, DESCRIBE, EXPLAIN --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt index cf9e634cc9..8dacc30ce9 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result() - seeking --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt index 30b49df4e5..1c2e857775 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_result - data types --SKIPIF-- <?php require_once('skipif.inc'); - require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_stmt_get_result')) diff --git a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt index c37c45af7d..7e6fe07a14 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt @@ -3,7 +3,6 @@ mysqli_stmt_get_warnings() - TODO --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt index e68b405acc..639c95944c 100644 --- a/ext/mysqli/tests/mysqli_stmt_init.phpt +++ b/ext/mysqli/tests/mysqli_stmt_init.phpt @@ -3,7 +3,6 @@ mysqli_stmt_init() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt index fe5e794e57..092c90c2a9 100644 --- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt @@ -3,7 +3,6 @@ mysqli_stmt_insert_id() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt index 33d9dfe552..f006b974eb 100644 --- a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt @@ -3,7 +3,6 @@ mysqli_stmt_num_rows() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt index 421854a480..0d1fa5ca55 100644 --- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt @@ -3,7 +3,6 @@ mysqli_stmt_param_count() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_prepare.phpt index 0f89a705c9..14929a9051 100644 --- a/ext/mysqli/tests/mysqli_stmt_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_prepare.phpt @@ -3,7 +3,6 @@ mysqli_stmt_prepare() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt index ac557b0c20..081a5f0855 100644 --- a/ext/mysqli/tests/mysqli_stmt_reset.phpt +++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt @@ -3,7 +3,6 @@ mysqli_stmt_reset() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt index aedcc5d9aa..0c77186efc 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt @@ -3,7 +3,6 @@ mysqli_stmt_result_metadata() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index a07719b906..877bd0c713 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt @@ -3,7 +3,6 @@ mysqli_stmt_result_metadata() - non SELECT statements --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.php?id=42490"); diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt index 705f19e8c2..b45098d298 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt @@ -3,7 +3,6 @@ mysqli_stmt_send_long_data() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt index 63c1f59bfe..c81e0c5d1a 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt @@ -3,7 +3,6 @@ mysqli_stmt_send_long_data() - exceed packet size, libmysql - bug #26824 --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (stristr(mysqli_get_client_info(), 'mysqlnd')) diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt index 927d07c5cf..64643d52f3 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt @@ -3,7 +3,6 @@ mysqli_stmt_send_long_data() - exceed packet size, mysqlnd --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!stristr(mysqli_get_client_info(), 'mysqlnd')) diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt index a365d4eb9e..959a5f7154 100644 --- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt @@ -3,7 +3,6 @@ mysqli_stmt_sqlstate() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt index 3c6ebe66b4..e798ce8a3c 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -3,7 +3,6 @@ mysqli_stmt_store_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt index 722295b177..0d77780022 100644 --- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt @@ -3,7 +3,6 @@ Trying to clone mysqli_stmt object --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt index 2213047a6c..7a0157106d 100644 --- a/ext/mysqli/tests/mysqli_store_result.phpt +++ b/ext/mysqli/tests/mysqli_store_result.phpt @@ -3,7 +3,6 @@ mysqli_store_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt index 31645b026c..6fa69005d2 100644 --- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt +++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt @@ -3,7 +3,6 @@ mysqli_store_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --INI-- diff --git a/ext/mysqli/tests/mysqli_store_result_copy.phpt b/ext/mysqli/tests/mysqli_store_result_copy.phpt index c431a05a60..51c76e7d3c 100644 --- a/ext/mysqli/tests/mysqli_store_result_copy.phpt +++ b/ext/mysqli/tests/mysqli_store_result_copy.phpt @@ -3,7 +3,6 @@ mysqli_store_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$IS_MYSQLND) { die("SKIP mysqlnd only test"); diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt index ce64b9a072..8e6cd1e6af 100644 --- a/ext/mysqli/tests/mysqli_thread_id.phpt +++ b/ext/mysqli/tests/mysqli_thread_id.phpt @@ -3,7 +3,6 @@ mysqli_thread_id() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_thread_safe.phpt b/ext/mysqli/tests/mysqli_thread_safe.phpt index 3f45127095..d4ab11a956 100644 --- a/ext/mysqli/tests/mysqli_thread_safe.phpt +++ b/ext/mysqli/tests/mysqli_thread_safe.phpt @@ -3,7 +3,6 @@ mysqli_thread_safe() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); ?> --FILE-- <?php diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt index d7f42c2f6e..27b75849c5 100644 --- a/ext/mysqli/tests/mysqli_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_unclonable.phpt @@ -3,7 +3,6 @@ Trying to clone mysqli object --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt index a6d432d1fb..ddbd734153 100644 --- a/ext/mysqli/tests/mysqli_use_result.phpt +++ b/ext/mysqli/tests/mysqli_use_result.phpt @@ -3,7 +3,6 @@ mysqli_use_result() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt index 18e80ac92d..1c1df0ccdf 100644 --- a/ext/mysqli/tests/mysqli_warning_count.phpt +++ b/ext/mysqli/tests/mysqli_warning_count.phpt @@ -3,7 +3,6 @@ mysqli_warning_count() --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt index e68cd96212..5e3758be96 100644 --- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt @@ -3,7 +3,6 @@ Trying to clone mysqli_warning object --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) diff --git a/ext/mysqli/tests/skipifnotemb.inc b/ext/mysqli/tests/skipifnotemb.inc deleted file mode 100644 index e88e423836..0000000000 --- a/ext/mysqli/tests/skipifnotemb.inc +++ /dev/null @@ -1,5 +0,0 @@ -<?php - $driver = new mysqli_driver(); - if (!$driver->embedded) - die("skip test for with embedded server only"); -?> |