diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-12-02 14:22:20 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-12-02 14:22:20 +0300 |
| commit | 017c751868779c28f9e9082fa9c0b01ac534afe6 (patch) | |
| tree | 19e7c85aae2c3f325b0a1c0e59d15c5a13232113 /mysql-test | |
| parent | e7337563d70bf85e333ab3a6d65d2c3dbca9052a (diff) | |
| parent | 44be131cd3ba86292342a48e6800f77ba3e3664c (diff) | |
| download | mariadb-git-017c751868779c28f9e9082fa9c0b01ac534afe6.tar.gz | |
Merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/mrr_tests.inc | 3 | ||||
| -rw-r--r-- | mysql-test/r/innodb_mrr.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/maria_mrr.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/myisam_mrr.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/myisam_mrr.test | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/include/mrr_tests.inc b/mysql-test/include/mrr_tests.inc index 21c419aa1a0..ad7dff61477 100644 --- a/mysql-test/include/mrr_tests.inc +++ b/mysql-test/include/mrr_tests.inc @@ -71,6 +71,9 @@ select b,filler from t3 where (b>='c-1011=w' and b<= 'c-1018=w') or # # Now try different keypart types and special values # +--disable_warnings +drop table if exists t4; +--enable_warnings create table t4 (a varchar(10), b int, c char(10), filler char(200), key idx1 (a, b, c)); diff --git a/mysql-test/r/innodb_mrr.result b/mysql-test/r/innodb_mrr.result index 1e50a8b84ed..8949aec266a 100644 --- a/mysql-test/r/innodb_mrr.result +++ b/mysql-test/r/innodb_mrr.result @@ -168,6 +168,7 @@ c-1020=w filler c-1021=w filler c-1022=w filler c-1023=w filler +drop table if exists t4; create table t4 (a varchar(10), b int, c char(10), filler char(200), key idx1 (a, b, c)); insert into t4 (filler) select concat('NULL-', 15-a) from t2 order by a limit 15; diff --git a/mysql-test/r/maria_mrr.result b/mysql-test/r/maria_mrr.result index 9153d795a17..bf1173e0bed 100644 --- a/mysql-test/r/maria_mrr.result +++ b/mysql-test/r/maria_mrr.result @@ -169,6 +169,7 @@ c-1020=w filler c-1021=w filler c-1022=w filler c-1023=w filler +drop table if exists t4; create table t4 (a varchar(10), b int, c char(10), filler char(200), key idx1 (a, b, c)); insert into t4 (filler) select concat('NULL-', 15-a) from t2 order by a limit 15; diff --git a/mysql-test/r/myisam_mrr.result b/mysql-test/r/myisam_mrr.result index 8befb17e5ac..306b8cc4f51 100644 --- a/mysql-test/r/myisam_mrr.result +++ b/mysql-test/r/myisam_mrr.result @@ -1,4 +1,4 @@ -drop table if exists t1, t2, t3; +drop table if exists t0, t1, t2, t3; set @mrr_buffer_size_save= @@mrr_buffer_size; set mrr_buffer_size=79; Warnings: @@ -170,6 +170,7 @@ c-1020=w filler c-1021=w filler c-1022=w filler c-1023=w filler +drop table if exists t4; create table t4 (a varchar(10), b int, c char(10), filler char(200), key idx1 (a, b, c)); insert into t4 (filler) select concat('NULL-', 15-a) from t2 order by a limit 15; @@ -432,8 +433,8 @@ a a b 1 1 1 2 2 2 NULL NULL 1234 -NULL NULL 1234 NULL NULL 5678 +NULL NULL 1234 NULL NULL 5678 set @@join_cache_level=@save_join_cache_level; drop table t0, t1; diff --git a/mysql-test/t/myisam_mrr.test b/mysql-test/t/myisam_mrr.test index 156528d3d29..82457ee4366 100644 --- a/mysql-test/t/myisam_mrr.test +++ b/mysql-test/t/myisam_mrr.test @@ -3,7 +3,7 @@ # --disable_warnings -drop table if exists t1, t2, t3; +drop table if exists t0, t1, t2, t3; --enable_warnings set @mrr_buffer_size_save= @@mrr_buffer_size; |