summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2004-12-31 15:13:48 +0300
committersergefp@mysql.com <>2004-12-31 15:13:48 +0300
commit849d1203ffb0a68ccec2e9e6e1baba00b2fbe536 (patch)
tree50ee7e4ca3276b5a026bd37840f832364e1fa01c /mysql-test/r
parent91ab26eaf1c6fb0147df00c50ac1e1a552fac582 (diff)
parentb572374c0b45c5c0c25de2a55a1037dd5c5898dc (diff)
downloadmariadb-git-849d1203ffb0a68ccec2e9e6e1baba00b2fbe536.tar.gz
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/index_merge.result3
1 files changed, 0 insertions, 3 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)