diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-03-14 18:32:01 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-03-14 18:32:01 +0100 |
| commit | 774d21cf3bcdf40ed3c2c33662766922cbbbb569 (patch) | |
| tree | 0e9bbc644772de90097a81a9fcdbadb0b9513257 /mysql-test/lib | |
| parent | 0b7d39fd5fa32c0dd3bbbdf27a2bc2cbe1bcd096 (diff) | |
| parent | 269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff) | |
| download | mariadb-git-774d21cf3bcdf40ed3c2c33662766922cbbbb569.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
mysql-test/include/commit.inc:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/commit_1innodb.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/rpl_rli.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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index debfc0f5726..3afa9e158a2 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -397,7 +397,10 @@ sub mtr_report_stats ($) { # rpl_temporary has an error on slave that can be ignored ($testname eq 'rpl.rpl_temporary' and (/Slave: Can\'t find record in \'user\' Error_code: 1032/ - )) + )) or + + # Test case for Bug#31590 produces the following error: + /Out of sort memory; increase server sort buffer size/ ) { next; # Skip these lines |