diff options
| author | unknown <kostja@bodhi.(none)> | 2008-05-20 22:23:58 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2008-05-20 22:23:58 +0400 |
| commit | 7ce32c91ba07d9b53cacbca2beb6d64064624aaf (patch) | |
| tree | 0f75f883ab5808644d7a7168b23652864e1a27d4 /tests | |
| parent | 3587539f2228aea4e40c695c60cc079ba86064c8 (diff) | |
| download | mariadb-git-7ce32c91ba07d9b53cacbca2beb6d64064624aaf.tar.gz | |
A number of fixes after a merge from the main 5.1 tree:
the local tree contains a fix for
Bug#32748 "Inconsistent handling of assignments to
general_log_file/slow_query_log_file",
which changes output of a number of tests.
mysql-test/r/general_log_file_basic.result:
Update results (Bug#32748)
mysql-test/r/log_output_basic.result:
Update the test with results of the fix for Bug#32748
mysql-test/r/slow_query_log_file_basic.result:
Update the test with results of the fix for Bug#32748
mysql-test/t/general_log_file_basic.test:
Adjust to take into account the fix for Bug#32748
(a port from 6.0-bugteam)
mysql-test/t/log_output_basic.test:
Adjust to take into account the fix for Bug#32748
(a port from 6.0-bugteam)
mysql-test/t/slow_query_log_file_basic.test:
Adjust to take into account the fix for Bug#32748
(a port from 6.0-bugteam)
tests/mysql_client_test.c:
Fix a compilation warning.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index cda7c75ba14..aafa22bdf7f 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17511,7 +17511,6 @@ static void test_wl4166_2() MYSQL_TIME d_date; MYSQL_BIND bind_out[2]; int rc; - int i; myheader("test_wl4166_2"); |