summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-03-30 14:55:53 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2011-03-30 14:55:53 +0200
commit89d96e3de9f8e8c4ff83c42d3615daf622280439 (patch)
treeed87e8abab2e8a1f8b8a23ba8988181f5161a18f /mysql-test/r
parentb227dc82b19d316248e1d1b959616b68b9235de7 (diff)
parent4c1eb0c1719004b66187a166ddf0765cb481a927 (diff)
downloadmariadb-git-89d96e3de9f8e8c4ff83c42d3615daf622280439.tar.gz
mtr: cleaned up some superfluos global warning suppressions
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/order_by.result1
-rw-r--r--mysql-test/r/show_check.result1
-rw-r--r--mysql-test/r/sp-destruct.result1
3 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
index f03ab28b484..1e65f889ea0 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -1429,6 +1429,7 @@ CALL mtr.add_suppression("Out of sort memory");
select * from t1 order by b;
ERROR HY001: Out of sort memory, consider increasing server sort buffer size
drop table t1;
+call mtr.add_suppression("Out of sort memory; increase server sort buffer size");
#
# Bug #39844: Query Crash Mysql Server 5.0.67
#
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index feeba25c536..8c0757fe0d6 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1338,6 +1338,7 @@ Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length I
DROP DATABASE `ä`;
show columns from `#mysql50#????????`;
Got one of the listed errors
+call mtr.add_suppression("Can.t find file: '.\\\\test\\\\\\?{8}.frm'");
DROP TABLE IF EXISTS t1;
DROP PROCEDURE IF EXISTS p1;
CREATE TABLE t1(c1 INT);
diff --git a/mysql-test/r/sp-destruct.result b/mysql-test/r/sp-destruct.result
index a3c8574d141..dc03016c516 100644
--- a/mysql-test/r/sp-destruct.result
+++ b/mysql-test/r/sp-destruct.result
@@ -1,4 +1,5 @@
call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted");
+call mtr.add_suppression("Stored routine .test...bug14233_[123].: invalid value in column mysql.proc");
use test;
drop procedure if exists bug14233;
drop function if exists bug14233;