diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-25 17:53:43 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-25 17:53:43 +0200 |
| commit | 24ebb184ca3f9a472d1244edd2170e7ba2babb1b (patch) | |
| tree | 4dabe801fcdcc80e35a7107e1a622c74c1b9ff52 /mysql-test/include/index_merge2.inc | |
| parent | c3b2933b3a6272dbfe054ba7a062d63c0f107107 (diff) | |
| download | mariadb-git-24ebb184ca3f9a472d1244edd2170e7ba2babb1b.tar.gz | |
fix for Bug#46897 'Test "index_merge_innodb" fails (mostly)':
that was already analyzed by Oracle: EXPLAIN can return 3 or 4 in "rows"; using replace_column to work around this.
mysql-test/include/index_merge2.inc:
replace "rows" column of some EXPLAINs by "#", if told so
mysql-test/r/index_merge_innodb.result:
result update
mysql-test/t/index_merge_innodb.test:
tell index_merge2.inc to accept random "rows" values in some EXPLAINs; we don't do this in index_merge_myisam.test
which has no randomness here.
Diffstat (limited to 'mysql-test/include/index_merge2.inc')
| -rw-r--r-- | mysql-test/include/index_merge2.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/include/index_merge2.inc b/mysql-test/include/index_merge2.inc index d65115eac0f..9b98eb3ebf2 100644 --- a/mysql-test/include/index_merge2.inc +++ b/mysql-test/include/index_merge2.inc @@ -122,12 +122,20 @@ insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b) analyze table t1; select count(*) from t1; +if ($index_merge_random_rows_in_EXPLAIN) +{ + --replace_column 9 # +} explain select count(*) from t1 where key1a = 2 and key1b is null and key2a = 2 and key2b is null; select count(*) from t1 where key1a = 2 and key1b is null and key2a = 2 and key2b is null; +if ($index_merge_random_rows_in_EXPLAIN) +{ + --replace_column 9 # +} explain select count(*) from t1 where key1a = 2 and key1b is null and key3a = 2 and key3b is null; |