Skip to content

Commit a03c1ed

Browse files
nikicnikic
committed
Remove vestiges of embedded mysql from tests
1 parent 0f9aefa commit a03c1ed

File tree

261 files changed

+2
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+2
-295
lines changed

‎ext/mysqli/mysqli.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,6 @@ static PHP_GINIT_FUNCTION(mysqli)
521521
mysqli_globals->report_mode = 0;
522522
mysqli_globals->report_ht = 0;
523523
mysqli_globals->allow_local_infile = 0;
524-
mysqli_globals->embedded = 0;
525524
mysqli_globals->rollback_on_cached_plink = FALSE;
526525
}
527526
/* }}} */

‎ext/mysqli/mysqli_driver.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ static int driver_report_write(mysqli_object *obj, zval *value)
8181
/* {{{ property driver_embedded_read */
8282
static int driver_embedded_read(mysqli_object *obj, zval *retval, zend_bool quiet)
8383
{
84+
/* No longer supported */
8485
ZVAL_FALSE(retval);
8586

8687
return SUCCESS;

‎ext/mysqli/php_mysqli_structs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
289289
zend_long report_mode;
290290
HashTable *report_ht;
291291
zend_ulong multi_query;
292-
zend_ulong embedded;
293292
zend_bool rollback_on_cached_plink;
294293
ZEND_END_MODULE_GLOBALS(mysqli)
295294

‎ext/mysqli/tests/001.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli connect
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/017.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli fetch functions
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/033.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ function test: mysqli_get_host_info
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/034.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ function test: mysqli_get_proto_info
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/045.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_stmt_bind_result (SHOW)
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87

98
require_once("connect.inc");

‎ext/mysqli/tests/049.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysql_fetch_row (OO-Style)
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/071.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli thread_id & kill
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/073.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mysqli_driver properties
1515
print "done!";
1616
?>
1717
--EXPECTF--
18-
bool(%s)
18+
bool(false)
1919
int(%d)
2020
string(%d) "%s"
2121
int(%d)

‎ext/mysqli/tests/bug33263.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Bug #33263 (mysqli_real_connect in __construct)
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/bug42378.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Bug #42378 (bind_result memory exhaustion, SELECT column, FORMAT(...) AS _format
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--INI--

‎ext/mysqli/tests/bug45019.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Bug #45019 (Segmentation fault with SELECT ? and UNION)
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/bug52082.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Bug #52082 (character_set_client & character_set_connection reset after mysqli_c
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/bug67839.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_float_handling - ensure 4 byte float is handled correctly
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--INI--

‎ext/mysqli/tests/bug70384.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_float_handling - ensure 4 byte float is handled correctly
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
if (@$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
98
if ($link->server_version < 50709) {

‎ext/mysqli/tests/bug73462.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Bug #73462 (Persistent connections don't set $connect_errno)
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/bug73949.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Bug #73949 (leak in mysqli_fetch_object)
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/bug75448.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_prepare() called on a closed connection should return FALSE (bug #75448)
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/bug76386.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Prepared Statement formatter truncates fractional seconds from date/time column
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
require_once("connect.inc");
98

‎ext/mysqli/tests/mysqli_affected_rows.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_affected_rows()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_affected_rows_oo.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli->affected_rows
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_auth_pam.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ PAM auth plugin
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('connect.inc');
87

98
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

‎ext/mysqli/tests/mysqli_autocommit.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_autocommit()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('connect.inc');
87
require_once('skipifconnectfailure.inc');
98

‎ext/mysqli/tests/mysqli_autocommit_oo.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli->autocommit()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
require_once('connect.inc');
98

‎ext/mysqli/tests/mysqli_begin_transaction.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_begin_transaction()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87

98
require_once('connect.inc');

‎ext/mysqli/tests/mysqli_change_user.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_change_user_get_lock.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user() - GET_LOCK()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
die("skip - is the server still buggy?");
98
?>

‎ext/mysqli/tests/mysqli_change_user_insert_id.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user() - LAST_INSERT_ID() - http://bugs.mysql.com/bug.php?id=45184
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
require_once('connect.inc');
98

‎ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user() - table locks, GET_LOCK(), temporary tables
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
die("skip - is the server still buggy?");
98
?>

‎ext/mysqli/tests/mysqli_change_user_new.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user(), MySQL 5.6+
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87

98
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))

‎ext/mysqli/tests/mysqli_change_user_old.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user(), MySQL < 5.6
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87

98
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))

‎ext/mysqli/tests/mysqli_change_user_oo.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli->change_user()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87

98
require_once('table.inc');

‎ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user() - Prepared Statement
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_change_user_rollback.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user() - ROLLBACK
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
require_once('connect.inc');
98
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))

‎ext/mysqli/tests/mysqli_change_user_set_names.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_change_user() - SET NAMES
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87

98
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))

‎ext/mysqli/tests/mysqli_character_set.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Fetching results from tables of different charsets.
44
<?php
55
require_once('skipif.inc');
66
require_once('skipifconnectfailure.inc');
7-
require_once('skipifemb.inc');
87

98
if (!function_exists('mysqli_set_charset')) {
109
die('skip mysqli_set_charset() not available');

‎ext/mysqli/tests/mysqli_character_set_name.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_character_set_name_oo.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Interface of the class mysqli_driver
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_class_mysqli_interface.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Interface of the class mysqli
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Interface of the class mysqli
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Interface of the class mysqli_result
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Interface of the class mysqli_stmt
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_class_mysqli_warning.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Interface of the class mysqli_warning - TODO
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
require_once('connect.inc');
98

‎ext/mysqli/tests/mysqli_close.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_close()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_close_oo.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_close()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87
?>
98
--FILE--

‎ext/mysqli/tests/mysqli_commit.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mysqli_commit()
33
--SKIPIF--
44
<?php
55
require_once('skipif.inc');
6-
require_once('skipifemb.inc');
76
require_once('skipifconnectfailure.inc');
87

98
require_once('connect.inc');

0 commit comments

Comments
 (0)