diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-26 12:32:27 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-26 12:32:27 +0200 |
| commit | 3a5a7ef44c600ab6265821945ce3ca53a5801270 (patch) | |
| tree | a72c3901c825aed1f51438938c9bd29cec582699 /mysql-test/lib | |
| parent | 2daa01682775d42bbe00d3fb41e0865079240de8 (diff) | |
| parent | 6ef32fd0a91148b9758acaa1e2ebde3110e96781 (diff) | |
| download | mariadb-git-3a5a7ef44c600ab6265821945ce3ca53a5801270.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
mysql-test/lib/mtr_report.pl:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_report.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 3afa9e158a2..3e09b888468 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -324,9 +324,9 @@ sub mtr_report_stats ($) { /Slave SQL:.*(?:Error_code: \d+|Query:.*)/ or /Sort aborted/ or /Time-out in NDB/ or - /Warning:\s+One can only use the --user.*root/ or - /Warning:\s+Setting lower_case_table_names=2/ or - /Warning:\s+Table:.* on (delete|rename)/ or + /One can only use the --user.*root/ or + /Setting lower_case_table_names=2/ or + /Table:.* on (delete|rename)/ or /You have an error in your SQL syntax/ or /deprecated/ or /description of time zone/ or |