diff options
| author | unknown <pem@mysql.comhem.se> | 2004-06-07 12:08:13 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2004-06-07 12:08:13 +0200 |
| commit | 5a83f0c85c899bdfc7e08fd6c75c4424db37b4dd (patch) | |
| tree | 6da2d06b59a6d5987bc016699e10cec0c7acd0df /mysql-test/r/index_merge.result | |
| parent | 17785f6344a91fc30f6f12cfe411f1250908a4b6 (diff) | |
| download | mariadb-git-5a83f0c85c899bdfc7e08fd6c75c4424db37b4dd.tar.gz | |
Post-merge fixes.
mysql-test/r/index_merge.result:
Post-merge update of results. (Ok according to Sanja)
sql/opt_range.cc:
Post-merge fix provided by Sergey Petrunia.
sql/sql_select.cc:
Post-merge fix provided by Sergey Petrunia.
Diffstat (limited to 'mysql-test/r/index_merge.result')
| -rw-r--r-- | mysql-test/r/index_merge.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/index_merge.result b/mysql-test/r/index_merge.result index 15e909c5af9..da86cc2910e 100644 --- a/mysql-test/r/index_merge.result +++ b/mysql-test/r/index_merge.result @@ -280,6 +280,7 @@ union select * from t1 where key1<4 or key3=5; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 index_merge i1,i2 i1,i2 4,4 NULL 2 Using where 2 UNION t1 index_merge i1,i3 i1,i3 4,4 NULL 5 Using where +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL explain select * from (select * from t1 where key1 = 3 or key2 =3) as Z where key8 >5; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY <derived2> system NULL NULL NULL NULL 1 |