Commit fc2f3176 authored by unknown's avatar unknown

After-merge fix for MySQL 5.1.41 merge: suppress some warnings during shutdown.

The MySQL 5.1.41 merge adds back some more warning lines in error log to be
checked. So some suppressions for these new ones need to be added to the code
in MariaDB that checks for warnings during server shutdown (MySQL only checks
for warnings that occur while executing the test cases themselves).
parent e5203306
...@@ -3983,6 +3983,13 @@ sub extract_warning_lines ($) { ...@@ -3983,6 +3983,13 @@ sub extract_warning_lines ($) {
qr/error .*connecting to master/, qr/error .*connecting to master/,
qr/InnoDB: Error: in ALTER TABLE `test`.`t[12]`/, qr/InnoDB: Error: in ALTER TABLE `test`.`t[12]`/,
qr/InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal/, qr/InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal/,
qr/Slave: Unknown table 't1' Error_code: 1051/,
qr/Slave SQL:.*(Error_code: [[:digit:]]+|Query:.*)/,
qr/slave SQL thread aborted/,
qr/unknown option '--loose-/,
qr/unknown variable 'loose-/,
qr/Now setting lower_case_table_names to [02]/,
qr/deprecated/,
); );
my $match_count= 0; my $match_count= 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment