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--

0 commit comments

Comments
 (0)