diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:50:39 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:50:39 +0200 |
| commit | 3378a48698a311403651fe9bb83d1dfe80a98d78 (patch) | |
| tree | da9c4b945967d94e3b16c2fd56a52699aba69b66 /mysql-test/r/flush2.result | |
| parent | f249185b6eead7796f15f880a896a7782222db99 (diff) | |
| parent | 44d4940fcc001a6606c63e8900d9e2bf41ea4e67 (diff) | |
| download | mariadb-git-3378a48698a311403651fe9bb83d1dfe80a98d78.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
SCCS merged
Diffstat (limited to 'mysql-test/r/flush2.result')
| -rw-r--r-- | mysql-test/r/flush2.result | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/mysql-test/r/flush2.result b/mysql-test/r/flush2.result index 7c94219fd71..13bcc371ef6 100644 --- a/mysql-test/r/flush2.result +++ b/mysql-test/r/flush2.result @@ -1,24 +1,12 @@ 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_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_queries_not_using_indexes OFF -log_slave_updates OFF -log_slow_queries OFF -log_warnings 1 set global expire_logs_days = 0; |