diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-11-26 11:27:01 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-11-26 11:27:01 +0200 |
| commit | 7a57359762f54fd2c3ac0b5af49fa55749c62e14 (patch) | |
| tree | f6e52bbf6584ae0b2328b268ba417e4c88945e3e /mysql-test/lib | |
| parent | a48b491b5ed1949d7e836ffafd285e8e5b1eb6b8 (diff) | |
| parent | 59d0d43e3af46b88a78606f83218fb871c2a87f0 (diff) | |
| download | mariadb-git-7a57359762f54fd2c3ac0b5af49fa55749c62e14.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
libmysql/CMakeLists.txt:
Auto merged
libmysql/Makefile.shared:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/myisam/mi_dynrec.c:
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 7ac292a516c..350109bdce3 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -312,9 +312,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 |