diff options
author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-04 15:20:58 +0200 |
---|---|---|
committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-04 15:20:58 +0200 |
commit | 29a142043ede302725a78b4f780cc016dcdf12bf (patch) | |
tree | 2ee140194f484e9b4436fa43d26e7bcdc7309eea /mysql-test/r/insert_select.result | |
parent | 905d715f10e711860311e0a10488c6bb5e19ee49 (diff) | |
parent | 4d676f314c5f41d3060b1326e677dc92487dcbcc (diff) | |
download | mariadb-git-29a142043ede302725a78b4f780cc016dcdf12bf.tar.gz |
initial merge from 5.1-mtr
Diffstat (limited to 'mysql-test/r/insert_select.result')
-rw-r--r-- | mysql-test/r/insert_select.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 1af66c41205..f12c9a0a61a 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -841,6 +841,7 @@ SET max_heap_table_size = 16384; SET @old_myisam_data_pointer_size = @@myisam_data_pointer_size; SET GLOBAL myisam_data_pointer_size = 2; INSERT INTO t1 VALUES (1), (2), (3), (4), (5); +call mtr.add_suppression("mysqld: The table '.*#sql.*' is full"); INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7; Got one of the listed errors SET GLOBAL myisam_data_pointer_size = @old_myisam_data_pointer_size; |