diff options
author | gluh@eagle.intranet.mysql.r18.ru <> | 2006-06-22 19:20:29 +0500 |
---|---|---|
committer | gluh@eagle.intranet.mysql.r18.ru <> | 2006-06-22 19:20:29 +0500 |
commit | 4c746fdb8eae30dd00fcf18133b216c1febf2e92 (patch) | |
tree | 05e4ebeb1746fe7c9296c5375f78db5ddffd9525 /mysql-test/t/log_state.test | |
parent | 5eea972046b764e944c296480b85f8f5bb50cc26 (diff) | |
download | mariadb-git-4c746fdb8eae30dd00fcf18133b216c1febf2e92.tar.gz |
test fix(to satisfy Win)
Diffstat (limited to 'mysql-test/t/log_state.test')
-rw-r--r-- | mysql-test/t/log_state.test | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test index d3dec841dc1..41fbd068dce 100644 --- a/mysql-test/t/log_state.test +++ b/mysql-test/t/log_state.test @@ -11,11 +11,11 @@ Variable_name = 'general_log' or Variable_name = 'slow_query_log'; flush logs; set global general_log= ON; create table t1(f1 int); ---replace_column 1 TIMESTAMP 3 # +--replace_column 1 TIMESTAMP 2 USER_HOST 3 # select * from mysql.general_log; set global general_log= OFF; drop table t1; ---replace_column 1 TIMESTAMP 3 # +--replace_column 1 TIMESTAMP 2 USER_HOST 3 # select * from mysql.general_log; set global general_log= ON; flush logs; @@ -27,7 +27,7 @@ connect (con1,localhost,root,,); connection con1; set session long_query_time=1; select sleep(2); ---replace_column 1 TIMESTAMP, 3 USER_HOST, 4 QUERY_TIME +--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME select * from mysql.slow_log; connection default; @@ -35,7 +35,7 @@ set global slow_query_log= ON; connection con1; set session long_query_time=1; select sleep(2); ---replace_column 1 TIMESTAMP, 3 USER_HOST, 4 QUERY_TIME +--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME select * from mysql.slow_log; disconnect con1; connection default; @@ -54,11 +54,11 @@ set global general_log= ON; truncate table mysql.general_log; create table t1(f1 int); drop table t1; ---replace_column 1 TIMESTAMP 3 # +--replace_column 1 TIMESTAMP 2 USER_HOST 3 # select * from mysql.general_log; set global general_log= OFF; truncate table mysql.general_log; ---replace_column 1 TIMESTAMP 3 # +--replace_column 1 TIMESTAMP 2 USER_HOST 3 # select * from mysql.general_log; set global general_log= ON; show global variables @@ -109,14 +109,14 @@ truncate table mysql.general_log; show variables like 'log_output'; set global general_log=ON; create table t1(f1 int); ---replace_column 1 TIMESTAMP 3 # +--replace_column 1 TIMESTAMP 2 USER_HOST 3 # select * from mysql.general_log; set global general_log=OFF; set global log_output="FILE,TABLE"; show variables like 'log_output'; set global general_log=ON; drop table t1; ---replace_column 1 TIMESTAMP 3 # +--replace_column 1 TIMESTAMP 2 USER_HOST 3 # select * from mysql.general_log; --enable_ps_protocol |