diff options
| author | unknown <thek@kpdesk.mysql.com> | 2006-12-04 23:51:54 +0100 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2006-12-04 23:51:54 +0100 |
| commit | fa52873b35858d2de45bf26dc5424f5062b2d3d2 (patch) | |
| tree | 2aaf5361d01cc3418cda25e3b1343eb4aaf03ac5 /mysql-test | |
| parent | d0482fee0a735031a43b4377cef696312c1e6bf1 (diff) | |
| parent | 3b8e73fb2d9526c0c1ed3228f28ddb7ff5def3fc (diff) | |
| download | mariadb-git-fa52873b35858d2de45bf26dc5424f5062b2d3d2.tar.gz | |
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
into kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/flush2.result | 24 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 2 | ||||
| -rw-r--r-- | mysql-test/t/flush2-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/flush2.test | 9 |
4 files changed, 36 insertions, 0 deletions
diff --git a/mysql-test/r/flush2.result b/mysql-test/r/flush2.result new file mode 100644 index 00000000000..7c94219fd71 --- /dev/null +++ b/mysql-test/r/flush2.result @@ -0,0 +1,24 @@ +flush logs; +set global expire_logs_days = 3; +show variables like 'log%'; +Variable_name Value +log ON +log_bin OFF +log_bin_trust_function_creators ON +log_error +log_queries_not_using_indexes OFF +log_slave_updates OFF +log_slow_queries OFF +log_warnings 1 +flush logs; +show variables like 'log%'; +Variable_name Value +log ON +log_bin OFF +log_bin_trust_function_creators ON +log_error +log_queries_not_using_indexes OFF +log_slave_updates OFF +log_slow_queries OFF +log_warnings 1 +set global expire_logs_days = 0; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index df56165950f..53b73363c22 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -12,3 +12,5 @@ ndb_load : Bug#17233 user_limits : Bug#23921 random failure of user_limits.test +flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin + diff --git a/mysql-test/t/flush2-master.opt b/mysql-test/t/flush2-master.opt new file mode 100644 index 00000000000..ccbd01c91d3 --- /dev/null +++ b/mysql-test/t/flush2-master.opt @@ -0,0 +1 @@ +--disable-log-bin diff --git a/mysql-test/t/flush2.test b/mysql-test/t/flush2.test new file mode 100644 index 00000000000..fc9e88e3141 --- /dev/null +++ b/mysql-test/t/flush2.test @@ -0,0 +1,9 @@ +# +# Bug#17733 Flushing logs causes daily server crash +# +flush logs; +set global expire_logs_days = 3; +show variables like 'log%'; +flush logs; +show variables like 'log%'; +set global expire_logs_days = 0; |