database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge with base Maria tree

Browse Source 
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
This commit is contained in:
Michael Widenius
2008-12-09 12:29:33 +02:00
parent d0fb8270df 7f3631c2bf
commit 9948682b43
29 changed files with 319 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/mysql-test-run.pl
View File

@@ -4006,11 +4006,13 @@ sub mysqld_arguments ($$$$) {
}
my $log_base_path= "$opt_vardir/log/$mysqld->{'type'}$sidx";
mtr_add_arg($args, "%s--general-log-file=%s.log --general-log",
mtr_add_arg($args, "%s--general-log-file=%s.log",
$prefix, $log_base_path);
mtr_add_arg($args, "--general-log");
mtr_add_arg($args,
"%s--slow-query-log-file=%s-slow.log --slow-query-log",
"%s--slow-query-log-file=%s-slow.log",
$prefix, $log_base_path);
mtr_add_arg($args, "--slow-query-log");
# Check if "extra_opt" contains --skip-log-bin
my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
@@ -5113,8 +5115,9 @@ sub gdb_arguments {
else
{
# write init file for mysqld
mtr_tofile($gdb_init_file,
"set args $str\n");
mtr_tofile($gdb_init_file, <<EOGDB );
set args $str
EOGDB
}
if ( $opt_manual_gdb )