Commit f9c2189f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/26538/my51-26538 

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
parents b64f46af b25ea49f

mysql-test/r/flush2.result

+2 −16
Original line number Diff line number Diff line 
flush logs;

set global expire_logs_days = 3;

show variables like 'log%';

show variables like 'log_bin%';

Variable_name	Value

log	ON

log_bin	OFF

log_bin_trust_function_creators	ON

log_error	

log_output	TABLE

log_queries_not_using_indexes	OFF

log_slave_updates	OFF

log_slow_queries	OFF

log_warnings	1

flush logs;

show variables like 'log%';

show variables like 'log_bin%';

Variable_name	Value

log	ON

log_bin	OFF

log_bin_trust_function_creators	ON

log_error	

log_output	TABLE

log_queries_not_using_indexes	OFF

log_slave_updates	OFF

log_slow_queries	OFF

log_warnings	1

set global expire_logs_days = 0;

mysql-test/t/flush2.test

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#

flush logs;

set global expire_logs_days = 3;

show variables like 'log%';

show variables like 'log_bin%';

flush logs;

show variables like 'log%';

show variables like 'log_bin%';

set global expire_logs_days = 0;