diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/log_state.result | 155 | ||||
| -rw-r--r-- | mysql-test/r/show_check.result | 20 | ||||
| -rw-r--r-- | mysql-test/t/log_state-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/log_state.test | 122 |
4 files changed, 285 insertions, 13 deletions
diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result new file mode 100644 index 00000000000..df81f05fea5 --- /dev/null +++ b/mysql-test/r/log_state.result @@ -0,0 +1,155 @@ +set global general_log= OFF; +truncate table mysql.general_log; +truncate table mysql.slow_log; +show global variables +where Variable_name = 'log' or Variable_name = 'log_slow_queries' or +Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +Variable_name Value +general_log OFF +log OFF +log_slow_queries OFF +slow_query_log OFF +flush logs; +set global general_log= ON; +create table t1(f1 int); +select * from mysql.general_log; +event_time user_host thread_id server_id command_type argument +TIMESTAMP root[root] @ localhost [] # 1 Query create table t1(f1 int) +TIMESTAMP root[root] @ localhost [] # 1 Query select * from mysql.general_log +set global general_log= OFF; +drop table t1; +select * from mysql.general_log; +event_time user_host thread_id server_id command_type argument +TIMESTAMP root[root] @ localhost [] # 1 Query create table t1(f1 int) +TIMESTAMP root[root] @ localhost [] # 1 Query select * from mysql.general_log +TIMESTAMP root[root] @ localhost [] # 1 Query set global general_log= OFF +set global general_log= ON; +flush logs; +show global variables +where Variable_name = 'log' or Variable_name = 'log_slow_queries' or +Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +Variable_name Value +general_log ON +log ON +log_slow_queries OFF +slow_query_log OFF +set session long_query_time=1; +select sleep(2); +sleep(2) +0 +select * from mysql.slow_log; +start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text +set global slow_query_log= ON; +set session long_query_time=1; +select sleep(2); +sleep(2) +0 +select * from mysql.slow_log; +start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text +TIMESTAMP, root[root] @ localhost [] USER_HOST, QUERY_TIME 1 0 test 0 0 1 select sleep(2) +show global variables +where Variable_name = 'log' or Variable_name = 'log_slow_queries' or +Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +Variable_name Value +general_log ON +log ON +log_slow_queries ON +slow_query_log ON +set global general_log= ON; +set global general_log= OFF; +set global general_log= OFF; +set global slow_query_log= ON; +set global slow_query_log= OFF; +set global slow_query_log= OFF; +set global general_log= ON; +truncate table mysql.general_log; +create table t1(f1 int); +drop table t1; +select * from mysql.general_log; +event_time user_host thread_id server_id command_type argument +TIMESTAMP root[root] @ localhost [] # 1 Query create table t1(f1 int) +TIMESTAMP root[root] @ localhost [] # 1 Query drop table t1 +TIMESTAMP root[root] @ localhost [] # 1 Query select * from mysql.general_log +set global general_log= OFF; +truncate table mysql.general_log; +select * from mysql.general_log; +event_time user_host thread_id server_id command_type argument +set global general_log= ON; +show global variables +where Variable_name = 'log' or Variable_name = 'log_slow_queries' or +Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +Variable_name Value +general_log ON +log ON +log_slow_queries OFF +slow_query_log OFF +show variables like 'general_log_file'; +Variable_name Value +general_log_file # +show variables like 'slow_query_log_file'; +Variable_name Value +slow_query_log_file # +show variables like 'log_output'; +Variable_name Value +log_output FILE,TABLE +set global general_log_file='/not exiting path/log.master'; +ERROR 42000: Variable 'general_log_file' can't be set to the value of '/not exiting path/log.master' +set global general_log_file='/tmp'; +ERROR 42000: Variable 'general_log_file' can't be set to the value of '/tmp' +set global general_log_file=''; +ERROR 42000: Variable 'general_log_file' can't be set to the value of '' +show variables like 'general_log_file'; +Variable_name Value +general_log_file # +set global general_log= OFF; +set global general_log_file='/tmp/log.master'; +set global general_log= ON; +create table t1(f1 int); +drop table t1; +set global general_log= OFF; +set global general_log_file=default; +set global general_log= ON; +create table t1(f1 int); +drop table t1; +show variables like 'general_log_file'; +Variable_name Value +general_log_file # +show variables like 'slow_query_log_file'; +Variable_name Value +slow_query_log_file # +set global general_log= default; +set global slow_query_log= default; +set global general_log_file= default; +set global slow_query_log_file= default; +show variables like 'general_log'; +Variable_name Value +general_log OFF +show variables like 'slow_query_log'; +Variable_name Value +slow_query_log OFF +set global general_log=ON; +set global log_output=default; +show variables like 'log_output'; +Variable_name Value +log_output TABLE +set global general_log=OFF; +set global log_output=FILE; +truncate table mysql.general_log; +show variables like 'log_output'; +Variable_name Value +log_output FILE +set global general_log=ON; +create table t1(f1 int); +select * from mysql.general_log; +event_time user_host thread_id server_id command_type argument +set global general_log=OFF; +set global log_output="FILE,TABLE"; +show variables like 'log_output'; +Variable_name Value +log_output FILE,TABLE +set global general_log=ON; +drop table t1; +select * from mysql.general_log; +event_time user_host thread_id server_id command_type argument +TIMESTAMP root[root] @ localhost [] # 1 Query drop table t1 +TIMESTAMP root[root] @ localhost [] # 1 Query select * from mysql.general_log diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 5dcb8b2afd6..154bd99a7f3 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -148,14 +148,12 @@ flush tables; show open tables; Database Table In_use Name_locked mysql general_log 1 0 -mysql slow_log 1 0 create table t1(n int); insert into t1 values (1); show open tables; Database Table In_use Name_locked -mysql general_log 1 0 -mysql slow_log 1 0 test t1 0 0 +mysql general_log 1 0 drop table t1; create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" ENGINE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed; show create table t1; @@ -568,23 +566,21 @@ SELECT 1 FROM mysql.db, mysql.proc, mysql.user, mysql.time_zone, mysql.time_zone 1 SHOW OPEN TABLES; Database Table In_use Name_locked -mysql proc 0 0 +mysql db 0 0 test urkunde 0 0 mysql time_zone 0 0 -mysql db 0 0 +mysql general_log 1 0 test txt1 0 0 -mysql slow_log 1 0 +mysql proc 0 0 test tyt2 0 0 -mysql general_log 1 0 mysql user 0 0 mysql time_zone_name 0 0 SHOW OPEN TABLES FROM mysql; Database Table In_use Name_locked -mysql proc 0 0 -mysql time_zone 0 0 mysql db 0 0 -mysql slow_log 1 0 +mysql time_zone 0 0 mysql general_log 1 0 +mysql proc 0 0 mysql user 0 0 mysql time_zone_name 0 0 SHOW OPEN TABLES FROM mysql LIKE 'u%'; @@ -598,16 +594,14 @@ test tyt2 0 0 mysql time_zone_name 0 0 SHOW OPEN TABLES LIKE '%o%'; Database Table In_use Name_locked -mysql proc 0 0 mysql time_zone 0 0 -mysql slow_log 1 0 mysql general_log 1 0 +mysql proc 0 0 mysql time_zone_name 0 0 FLUSH TABLES; SHOW OPEN TABLES; Database Table In_use Name_locked mysql general_log 1 0 -mysql slow_log 1 0 DROP TABLE txt1; DROP TABLE tyt2; DROP TABLE urkunde; diff --git a/mysql-test/t/log_state-master.opt b/mysql-test/t/log_state-master.opt new file mode 100644 index 00000000000..445c6223d47 --- /dev/null +++ b/mysql-test/t/log_state-master.opt @@ -0,0 +1 @@ +--log-output=TABLE,FILE --log --general-log=0 --log-slow-queries --slow-query-log=0 diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test new file mode 100644 index 00000000000..d3dec841dc1 --- /dev/null +++ b/mysql-test/t/log_state.test @@ -0,0 +1,122 @@ +-- source include/not_embedded.inc +--source include/have_csv.inc + +--disable_ps_protocol +set global general_log= OFF; +truncate table mysql.general_log; +truncate table mysql.slow_log; +show global variables +where Variable_name = 'log' or Variable_name = 'log_slow_queries' or +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 # +select * from mysql.general_log; +set global general_log= OFF; +drop table t1; +--replace_column 1 TIMESTAMP 3 # +select * from mysql.general_log; +set global general_log= ON; +flush logs; +show global variables +where Variable_name = 'log' or Variable_name = 'log_slow_queries' or +Variable_name = 'general_log' or Variable_name = 'slow_query_log'; + +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 +select * from mysql.slow_log; +connection default; + +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 +select * from mysql.slow_log; +disconnect con1; +connection default; +show global variables +where Variable_name = 'log' or Variable_name = 'log_slow_queries' or +Variable_name = 'general_log' or Variable_name = 'slow_query_log'; + +set global general_log= ON; +set global general_log= OFF; +set global general_log= OFF; +set global slow_query_log= ON; +set global slow_query_log= OFF; +set global slow_query_log= OFF; + +set global general_log= ON; +truncate table mysql.general_log; +create table t1(f1 int); +drop table t1; +--replace_column 1 TIMESTAMP 3 # +select * from mysql.general_log; +set global general_log= OFF; +truncate table mysql.general_log; +--replace_column 1 TIMESTAMP 3 # +select * from mysql.general_log; +set global general_log= ON; +show global variables +where Variable_name = 'log' or Variable_name = 'log_slow_queries' or +Variable_name = 'general_log' or Variable_name = 'slow_query_log'; + +--replace_column 2 # +show variables like 'general_log_file'; +--replace_column 2 # +show variables like 'slow_query_log_file'; +show variables like 'log_output'; + +--error 1231 +set global general_log_file='/not exiting path/log.master'; +--error 1231 +set global general_log_file='/tmp'; +--error 1231 +set global general_log_file=''; +--replace_column 2 # +show variables like 'general_log_file'; +set global general_log= OFF; +set global general_log_file='/tmp/log.master'; +set global general_log= ON; +create table t1(f1 int); +drop table t1; +set global general_log= OFF; +set global general_log_file=default; +set global general_log= ON; +create table t1(f1 int); +drop table t1; +--replace_column 2 # +show variables like 'general_log_file'; +--replace_column 2 # +show variables like 'slow_query_log_file'; + +set global general_log= default; +set global slow_query_log= default; +set global general_log_file= default; +set global slow_query_log_file= default; +show variables like 'general_log'; +show variables like 'slow_query_log'; +set global general_log=ON; +set global log_output=default; +show variables like 'log_output'; +set global general_log=OFF; +set global log_output=FILE; +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 # +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 # +select * from mysql.general_log; + +--enable_ps_protocol |