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.
This commit is contained in:
unknown 2008-05-20 22:23:58 +04:00
commit 7ce32c91ba
7 changed files with 19 additions and 7 deletions

View file

@ -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");