diff options
Diffstat (limited to 'ext/mysqli/tests/mysqli_pconn_max_links.phpt')
| -rw-r--r-- | ext/mysqli/tests/mysqli_pconn_max_links.phpt | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt index f6ee6aa5a0..f48222c425 100644 --- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt +++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt @@ -2,41 +2,41 @@ Persistent connections and mysqli.max_links --SKIPIF-- <?php - require_once('skipif.inc'); - require_once('skipifconnectfailure.inc'); - require_once('table.inc'); - - mysqli_query($link, 'DROP USER pcontest'); - mysqli_query($link, 'DROP USER pcontest@localhost'); - - if (!mysqli_query($link, 'CREATE USER pcontest@"%" IDENTIFIED BY "pcontest"') || - !mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"')) { - printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link)); - mysqli_close($link); - die("skip CREATE USER failed"); - } - - // we might be able to specify the host using CURRENT_USER(), but... - if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'%%'", $db)) || - !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) { - printf("skip Cannot GRANT SELECT to second DB user [%d] %s", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); - mysqli_query($link, 'DROP USER pcontest@localhost'); - mysqli_query($link, 'DROP USER pcontest'); - mysqli_close($link); - die("skip GRANT failed"); - } - - if (!($link_pcontest = @my_mysqli_connect($host, 'pcontest', 'pcontest', $db, $port, $socket))) { - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); - mysqli_query($link, 'DROP USER pcontest@localhost'); - mysqli_query($link, 'DROP USER pcontest'); - mysqli_close($link); - die("skip CONNECT using new user failed"); + require_once('skipif.inc'); + require_once('skipifconnectfailure.inc'); + require_once('table.inc'); + + mysqli_query($link, 'DROP USER pcontest'); + mysqli_query($link, 'DROP USER pcontest@localhost'); + + if (!mysqli_query($link, 'CREATE USER pcontest@"%" IDENTIFIED BY "pcontest"') || + !mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"')) { + printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link)); + mysqli_close($link); + die("skip CREATE USER failed"); + } + + // we might be able to specify the host using CURRENT_USER(), but... + if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'%%'", $db)) || + !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) { + printf("skip Cannot GRANT SELECT to second DB user [%d] %s", mysqli_errno($link), mysqli_error($link)); + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest'); + mysqli_close($link); + die("skip GRANT failed"); } - mysqli_close($link); + + if (!($link_pcontest = @my_mysqli_connect($host, 'pcontest', 'pcontest', $db, $port, $socket))) { + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest'); + mysqli_close($link); + die("skip CONNECT using new user failed"); + } + mysqli_close($link); ?> --INI-- mysqli.allow_persistent=1 |