diff options
author | unknown <monty@mysql.com> | 2006-05-05 20:08:40 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2006-05-05 20:08:40 +0300 |
commit | 3995b06b40290cc836098fed18b2299efea1d652 (patch) | |
tree | d106da477f33eec83b9b2457a6a1f6c03d5855bb /mysql-test/lib | |
parent | d1b6779adef729bafc9a105466a237488ee8cce1 (diff) | |
download | mariadb-git-3995b06b40290cc836098fed18b2299efea1d652.tar.gz |
Don't use row level logging on optimize or repair table.
(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)
mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
Added extra test + drop of table at end of test
mysql-test/lib/mtr_report.pl:
Fail if mysqld asserts or prints stack
mysql-test/mysql-test-run.sh:
Fail if mysqld asserts or prints stack
mysql-test/r/exampledb.result:
Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/r/innodb.result:
Extra test to see that we can do an optimize table on an active transaction
mysql-test/r/rpl_failed_optimize.result:
Added extra test + drop of table at end of test
mysql-test/t/exampledb.test:
Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/t/innodb.test:
Extra test to see that we can do an optimize table on an active transaction
sql/handler.cc:
Don't use row level logging on optimize or repair table.
sql/log.cc:
Simplify code (no logic changes)
sql/mysql_priv.h:
Added prototype
sql/sql_base.cc:
Better name for define
sql/sql_class.cc:
Indentation fix
sql/sql_parse.cc:
Make end_active_trans() global
sql/sql_table.cc:
Ensure we end active transcations if we do an admin command (like optimize, repair etc)
Diffstat (limited to 'mysql-test/lib')
-rw-r--r-- | mysql-test/lib/mtr_report.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 56601d9236a..f2da89355f7 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -218,7 +218,8 @@ sub mtr_report_stats ($) { # We report different types of problems in order foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x", "InnoDB: Warning", "missing DBUG_RETURN", - "mysqld: Warning") + "mysqld: Warning", + "Attempting backtrace", "Assertion .* failed" ) { foreach my $errlog ( sort glob("$::opt_vardir/log/*.err") ) { @@ -232,7 +233,8 @@ sub mtr_report_stats ($) { # Skip some non fatal warnings from the log files if ( /Warning:\s+Table:.* on (delete|rename)/ or /Warning:\s+Setting lower_case_table_names=2/ or - /Warning:\s+One can only use the --user.*root/ ) + /Warning:\s+One can only use the --user.*root/ or + /InnoDB: Warning: we did not need to do crash recovery/) { next; # Skip these lines } |