Skip to content

Commit 4a10037

Browse files
grooverdancmb69
authored andcommitted
Fix mysqli_get_client_stats test
MySQL removed RENAME DATABASE in 18300001c1dbbfddf9a0adcbaeea68956102bdd0 (Sept 2007, 5.1.23). As this briefest existance is very insignificant lets remove it. It also breaks when testing against MariaDB. As the alternate path in this test covers all supported MySQL and MariaDB versions and a signifant portion of unsupported versions lets keep it simple. Closes GH-6459.
1 parent b5ce6df commit 4a10037

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

ext/mysqli/tests/mysqli_get_client_stats.phpt

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ mysqli.allow_local_infile=1
666666
$info = $new_info;
667667

668668

669-
// CREATE, ALTER, RENAME, DROP DATABASE
669+
// CREATE, ALTER, DROP DATABASE
670670
if (mysqli_query($link, "CREATE DATABASE mysqli_get_client_stats")) {
671671

672672
if (!is_array($new_info = mysqli_get_client_stats()) || empty($new_info))
@@ -685,25 +685,13 @@ mysqli.allow_local_infile=1
685685
mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info, (string)($info['non_result_set_queries'] + 1), $test_counter, 'CREATE DATABASE');
686686
$info = $new_info;
687687

688-
if (mysqli_get_server_version($link) > 51700) {
689-
if (!mysqli_query($link, "RENAME DATABASE mysqli_get_client_stats TO mysqli_get_client_stats_"))
690-
printf("[%03d] RENAME DATABASE failed, [%d] %s\n", ++$test_counter,
691-
mysqli_errno($link), mysqli_error($link));
692-
693-
if (!is_array($new_info = mysqli_get_client_stats()) || empty($new_info))
694-
printf("[%03d] Expecting array/any_non_empty, got %s/%s\n",
695-
++$test_counter, gettype($new_info), $new_info);
696-
mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info, (string)($info['non_result_set_queries'] + 1), $test_counter, 'CREATE DATABASE');
697-
$info = $new_info;
698-
} else {
699-
if (!mysqli_query($link, "CREATE DATABASE mysqli_get_client_stats_"))
700-
printf("[%03d] CREATE DATABASE failed, [%d] %s\n", ++$test_counter,
701-
mysqli_errno($link), mysqli_error($link));
702-
if (!is_array($new_info = mysqli_get_client_stats()) || empty($new_info))
703-
printf("[%03d] Expecting array/any_non_empty, got %s/%s\n",
704-
++$test_counter, gettype($new_info), $new_info);
705-
$info = $new_info;
706-
}
688+
if (!mysqli_query($link, "CREATE DATABASE mysqli_get_client_stats_"))
689+
printf("[%03d] CREATE DATABASE failed, [%d] %s\n", ++$test_counter,
690+
mysqli_errno($link), mysqli_error($link));
691+
if (!is_array($new_info = mysqli_get_client_stats()) || empty($new_info))
692+
printf("[%03d] Expecting array/any_non_empty, got %s/%s\n",
693+
++$test_counter, gettype($new_info), $new_info);
694+
$info = $new_info;
707695

708696
if (!mysqli_query($link, "DROP DATABASE mysqli_get_client_stats_"))
709697
printf("[%03d] DROP DATABASE failed, [%d] %s\n", ++$test_counter,

0 commit comments

Comments
 (0)