database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fixed problem with crash in Maria _ma_setup_live_state() where history link didn't include needed state

Browse Source 
mysql-test/mysql-test-run.pl:
  Remove warnings in log about depricated mysqld options
storage/maria/ma_state.c:
  More DBUG_PRINT
storage/maria/trnman.c:
  Fixed wrong test if commit_trid is visible
This commit is contained in:
Michael Widenius
2008-12-08 20:31:16 +02:00
parent d83f647024
commit d0fb8270df
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3325,9 +3325,11 @@ socket = $instance->{path_sock}
pid-file = $instance->{path_pid}
port = $instance->{port}
datadir = $instance->{path_datadir}
log = $instance->{path_datadir}/mysqld$server_id.log
general-log-file = $instance->{path_datadir}/mysqld$server_id.log
general-log = 1
log-error = $instance->{path_datadir}/mysqld$server_id.err.log
log-slow-queries = $instance->{path_datadir}/mysqld$server_id.slow.log
slow-query-log-file = $instance->{path_datadir}/mysqld$server_id.slow.log
slow-query-log = 1
language = $path_language
character-sets-dir = $path_charsetsdir
basedir = $path_my_basedir
@@ -4004,9 +4006,11 @@ sub mysqld_arguments ($$$$) {
}
my $log_base_path= "$opt_vardir/log/$mysqld->{'type'}$sidx";
mtr_add_arg($args, "%s--log=%s.log", $prefix, $log_base_path);
mtr_add_arg($args, "%s--general-log-file=%s.log --general-log",
$prefix, $log_base_path);
mtr_add_arg($args,
"%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
"%s--slow-query-log-file=%s-slow.log --slow-query-log",
$prefix, $log_base_path);
# Check if "extra_opt" contains --skip-log-bin
my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);