summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-02-28 12:59:38 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-02-28 15:43:29 +0100
commit248f9cf33f855133669b7748a32d7b73256b0f4a (patch)
treed5d01fb20d6e46fa18e444afed6af6590c75d48b
parent9624e87a8fb4a3ae99bd6ed2cda6bd953ce3d98c (diff)
downloadphp-git-248f9cf33f855133669b7748a32d7b73256b0f4a.tar.gz
Remove more leftovers of mysqli embedded server
-rw-r--r--ext/mysqli/mysqli_fe.h2
-rw-r--r--ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt9
2 files changed, 0 insertions, 11 deletions
diff --git a/ext/mysqli/mysqli_fe.h b/ext/mysqli/mysqli_fe.h
index 0292dca64f..c6e8293d1a 100644
--- a/ext/mysqli/mysqli_fe.h
+++ b/ext/mysqli/mysqli_fe.h
@@ -101,8 +101,6 @@ PHP_FUNCTION(mysqli_stmt_prepare);
PHP_FUNCTION(mysqli_stmt_fetch);
PHP_FUNCTION(mysqli_stmt_param_count);
PHP_FUNCTION(mysqli_stmt_send_long_data);
-PHP_FUNCTION(mysqli_embedded_server_end);
-PHP_FUNCTION(mysqli_embedded_server_start);
PHP_FUNCTION(mysqli_sqlstate);
PHP_FUNCTION(mysqli_ssl_set);
PHP_FUNCTION(mysqli_stat);
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt
index 681590e1ab..78784210bb 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt
@@ -20,15 +20,6 @@ require_once('skipifconnectfailure.inc');
$methods = get_class_methods($driver);
$expected_methods = array();
- if (!$IS_MYSQLND && (isset($methods['embedded_server_start']))) {
- /* libmysql only - needs extra compile flag, no way to check properly in the
- PHP user land if its compiled in or not */
- $expected_methods = array_merge($expected_methods, array(
- 'embedded_server_start' => true,
- 'embedded_server_end' => true,
- ));
- }
-
foreach ($methods as $k => $method) {
if (isset($expected_methods[$method])) {
unset($expected_methods[$method]);