diff options
| author | Michael Widenius <monty@mysql.com> | 2008-12-09 12:29:33 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-12-09 12:29:33 +0200 |
| commit | 9948682b43c8d94ca1838661dbec59466c6ef950 (patch) | |
| tree | 0ec91bcde86a8c9d62bb83d9c03d3797a4078566 /mysql-test/t/log_tables-master.opt | |
| parent | d0fb8270dfa785392c2bc3ad4ffd61329586d887 (diff) | |
| parent | 7f3631c2bf2074d9fe9adff882373a7f00575915 (diff) | |
| download | mariadb-git-9948682b43c8d94ca1838661dbec59466c6ef950.tar.gz | |
Merge with base Maria tree
Remove warnings from test logs about depricated options
mysql-test/t/events_logs_tests-master.opt:
Remove warnings from test logs about depricated options
mysql-test/t/log_tables-big-master.opt:
Remove warnings from test logs about depricated options
mysql-test/t/log_tables-master.opt:
Remove warnings from test logs about depricated options
mysql-test/t/multi_statement-master.opt:
Remove warnings from test logs about depricated options
mysql-test/t/ps-master.opt:
Remove warnings from test logs about depricated options
mysql-test/t/show_check-master.opt:
Remove warnings from test logs about depricated options
mysql-test/t/slow_query_log_file_basic-master.opt:
Remove warnings from test logs about depricated options
mysql-test/t/slow_query_log_file_func-master.opt:
Remove warnings from test logs about depricated options
mysql-test/t/union-master.opt:
Remove warnings from test logs about depricated options
sql/mysqld.cc:
Don't give warnings for empty log file names
Diffstat (limited to 'mysql-test/t/log_tables-master.opt')
| -rw-r--r-- | mysql-test/t/log_tables-master.opt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/log_tables-master.opt b/mysql-test/t/log_tables-master.opt index 35ff7911705..4c25518cefe 100644 --- a/mysql-test/t/log_tables-master.opt +++ b/mysql-test/t/log_tables-master.opt @@ -1 +1 @@ ---log-slow-queries +--log-output=table,file --slow-query-log --general-log |