From 6356bcbbb94c6985dbd4904aec15e57bdc1e7e48 Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Thu, 27 May 2010 12:09:39 +0000 Subject: [PATCH] Test fixes and updates to work with a wider range of MySQL server configs --- ext/mysqli/tests/bug51647.phpt | 2 +- .../tests/mysqli_get_cache_stats_off.phpt | 34 +++++++------------ .../tests/mysqli_get_client_stats_off.phpt | 18 +++++----- .../tests/mysqli_insert_packet_overflow.phpt | 14 ++++++-- .../mysqli_stmt_bind_param_many_columns.phpt | 32 ++++++++--------- 5 files changed, 51 insertions(+), 49 deletions(-) diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt index 6726b4e4e4..b222aa5f01 100644 --- a/ext/mysqli/tests/bug51647.phpt +++ b/ext/mysqli/tests/bug51647.phpt @@ -23,6 +23,6 @@ array(2) { ["Variable_name"]=> string(10) "Ssl_cipher" ["Value"]=> - string(%d) "%s" + string(%d) "%S" } done! diff --git a/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt b/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt index 4b0bab2406..bbfe503b2b 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt @@ -15,8 +15,14 @@ if (!function_exists('mysqli_get_cache_stats')) { --FILE-- true); - foreach ($before as $k => $v) { - if (isset($ignore[$k])) - continue; - - if ($before[$k] != $after[$k]) - printf("[004] Statistics have changed - %s: %s => %s\n", $ - $k, $before[$k], $after[$k]); - } - - $ignore = array("size" => true, "free_items" => true, "references" => true); - foreach ($after as $k => $v) { - if ($v != 0 && !isset($ignore[$k])) { - printf("[005] Field %s should not have any other value but 0, got %s.\n", - $k, $v); - } + if ($before !== $after) { + printf("[002] Statistics have changed\n"); + var_dump($before); + var_dump($after); } - mysqli_close($link); print "done!"; @@ -61,4 +53,4 @@ if (!function_exists('mysqli_get_cache_stats')) { require_once("clean_table.inc"); ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt index e2dff9befb..884f426c71 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt @@ -15,8 +15,16 @@ mysqlnd.collect_memory_statistics=0 --FILE-- $v) - if ($v != 0) { - printf("[003] Field %s should not have any other value but 0, got %s.\n", - $k, $v); - } - mysqli_close($link); print "done!"; ?> diff --git a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt index 725636e146..35f35a5dc1 100644 --- a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt +++ b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt @@ -38,8 +38,15 @@ memory_limit=256M $max_len = pow(2, 24); if ($org_max_allowed_packet < $max_len) { - if (!mysqli_query($link, "SET GLOBAL max_allowed_packet = " . ($max_len + 100))) - printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + if (!mysqli_query($link, "SET GLOBAL max_allowed_packet = " . ($max_len + 100))) { + if (1227 == mysqli_errno($link)) { + /* [1227] Access denied; you need the SUPER privilege for this operation */ + print "done!"; + exit(0); + } else { + printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } + } } mysqli_close($link); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) @@ -94,7 +101,8 @@ memory_limit=256M } if (!mysqli_query($link, "SET GLOBAL max_allowed_packet = " . $org_max_allowed_packet)) - printf("[017] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + if (1227 != mysqli_errno($link)) + printf("[017] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); mysqli_close($link); diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt index 2468c38b2d..29a5ee3fbd 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt @@ -22,14 +22,22 @@ memory_limit=256M require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { - printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); exit(1); } + $cols = 2500; + list($old_max_allowed_packet) = $link->query("SELECT @@max_allowed_packet")->fetch_row(); if (!$link->query("SET GLOBAL max_allowed_packet=(2<<29)")) { - printf("Failed to set max_allowed_packet the test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + if (1227 == mysqli_errno($link)) { + /* [1227] Access denied; you need the SUPER privilege for this operation */ + $cols = 10; + } else { + $cols = 10; + printf("[002] Failed to set max_allowed_packet the test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } } mysqli_close($link); @@ -40,22 +48,21 @@ memory_limit=256M exit(1); } - if (!mysqli_query($link, 'DROP TABLE IF EXISTS ps_test')) { + if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); exit(1); } - $cols = 2500; $str = array(); for ($i = 1; $i <= $cols; $i++) { $str[] ="a$i BLOB"; } - $link->query("CREATE TABLE ps_test(" . implode(" , ", $str) . ") ENGINE=MyISAM"); + $link->query("CREATE TABLE test(" . implode(" , ", $str) . ") ENGINE=MyISAM"); if (mysqli_errno($link)) { printf("Failed to create the test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); die(""); } - $stmt = $link->prepare("INSERT INTO ps_test VALUES(".str_repeat("?, ", $cols-1) . "?)"); + $stmt = $link->prepare("INSERT INTO test VALUES(".str_repeat("?, ", $cols-1) . "?)"); var_dump($stmt->id); $s = str_repeat("a", 2 << 12); $eval_str="\$stmt->bind_param(\"".str_repeat("s",$cols)."\", "; @@ -77,7 +84,8 @@ memory_limit=256M if (!$link->query("SET GLOBAL max_allowed_packet=$old_max_allowed_packet")) { - printf("Failed to set max_allowed_packet the test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + if (1227 != mysqli_errno($link)) + printf("Failed to set max_allowed_packet the test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); } mysqli_close($link); @@ -86,15 +94,7 @@ memory_limit=256M ?> --CLEAN-- --EXPECTF-- int(1) -- 2.40.0