mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
- MFH: Remove more replication stuff
This commit is contained in:
parent
60a1a17399
commit
32dfad780c
@ -760,13 +760,6 @@ PHP_MINIT_FUNCTION(mysqli)
|
||||
|
||||
REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, CONST_CS | CONST_PERSISTENT);
|
||||
|
||||
/* replication */
|
||||
#if !defined(HAVE_MYSQLND)
|
||||
REGISTER_LONG_CONSTANT("MYSQLI_RPL_MASTER", MYSQL_RPL_MASTER, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("MYSQLI_RPL_SLAVE", MYSQL_RPL_SLAVE, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("MYSQLI_RPL_ADMIN", MYSQL_RPL_ADMIN, CONST_CS | CONST_PERSISTENT);
|
||||
#endif
|
||||
|
||||
/* bind support */
|
||||
REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT);
|
||||
#ifdef MYSQL_DATA_TRUNCATED
|
||||
|
@ -1,46 +0,0 @@
|
||||
--TEST--
|
||||
mysqli_master_query()
|
||||
--SKIPIF--
|
||||
<?php
|
||||
require_once('skipif.inc');
|
||||
require_once('skipifemb.inc');
|
||||
require_once('skipifconnectfailure.inc');
|
||||
if (!function_exists('mysqli_master_query')) {
|
||||
die("skip mysqli_master_query() not available");
|
||||
}
|
||||
require_once('connect.inc');
|
||||
if (!$TEST_EXPERIMENTAL)
|
||||
die("skip - experimental (= unsupported) feature");
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
/* NOTE: tests is a stub, but function is deprecated, as long as it does not crash when invoking it... */
|
||||
include "connect.inc";
|
||||
|
||||
$tmp = NULL;
|
||||
$link = NULL;
|
||||
|
||||
if (NULL !== ($tmp = @mysqli_master_query()))
|
||||
printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
|
||||
|
||||
if (NULL !== ($tmp = @mysqli_master_query($link)))
|
||||
printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
|
||||
|
||||
if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
|
||||
printf("[003] 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_master_query($link, 'SELECT 1')))
|
||||
printf("[004] Expecting boolean/[true|false] value, got %s/%s\n", gettype($tmp), $tmp);
|
||||
|
||||
mysqli_close($link);
|
||||
|
||||
if (NULL !== ($tmp = mysqli_master_query($link)))
|
||||
printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
|
||||
|
||||
print "done!";
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: mysqli_master_query(): Couldn't fetch mysqli in %s on line %d
|
||||
done!
|
Loading…
Reference in New Issue
Block a user