diff options
| author | unknown <sergefp@mysql.com> | 2004-12-31 15:13:48 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-12-31 15:13:48 +0300 |
| commit | bd23099be0b22845e8c97e2fb36ee3c6eb0e2491 (patch) | |
| tree | 50ee7e4ca3276b5a026bd37840f832364e1fa01c | |
| parent | 17ea34299afbbb6d11296fdd4061bc6fe4061d74 (diff) | |
| parent | b5de0a073de52fb62a9b3da916a8105d6375a3ef (diff) | |
| download | mariadb-git-bd23099be0b22845e8c97e2fb36ee3c6eb0e2491.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
| -rw-r--r-- | mysql-test/r/index_merge.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/index_merge.test | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/r/index_merge.result b/mysql-test/r/index_merge.result index 07e87832c0b..0f217b7b8ab 100644 --- a/mysql-test/r/index_merge.result +++ b/mysql-test/r/index_merge.result @@ -340,9 +340,6 @@ create table t4 (a int); insert into t4 values (1),(4),(3); set @save_join_buffer_size=@@join_buffer_size; set join_buffer_size= 4000; -show variables like 'join_buffer_size'; -Variable_name Value -join_buffer_size 8200 explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) from t0 as A force index(i1,i2), t0 as B force index (i1,i2) where (A.key1 < 500000 or A.key2 < 3) diff --git a/mysql-test/t/index_merge.test b/mysql-test/t/index_merge.test index 3ab68d85125..f2f71cbe208 100644 --- a/mysql-test/t/index_merge.test +++ b/mysql-test/t/index_merge.test @@ -283,7 +283,6 @@ create table t4 (a int); insert into t4 values (1),(4),(3); set @save_join_buffer_size=@@join_buffer_size; set join_buffer_size= 4000; -show variables like 'join_buffer_size'; explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) from t0 as A force index(i1,i2), t0 as B force index (i1,i2) where (A.key1 < 500000 or A.key2 < 3) |