summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/r
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-12-03 20:26:15 -0800
committerIgor Babaev <igor@askmonty.org>2010-12-03 20:26:15 -0800
commite13406b29b4962579bb0bf906d42eccd516675ff (patch)
tree2fb47e4ba32cbba17b85a4299a558152be5479bc /mysql-test/suite/innodb/r
parent80377bbf6dadd1772f6b4f4d4258892a023d586a (diff)
downloadmariadb-git-e13406b29b4962579bb0bf906d42eccd516675ff.tar.gz
Changed the queries of index_intersect.test to ensure platform
independent execution plans. Fixed a bug in Unique::unique_add that caused a crash for a query from index_intersect_innodb on some platforms. Fixed two bugs in opt_range.cc that led to the choice of not the cheapest plans for index intersections.
Diffstat (limited to 'mysql-test/suite/innodb/r')
-rw-r--r--mysql-test/suite/innodb/r/innodb_mysql.result2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index fa19dee7d26..abb9642e6e8 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -679,8 +679,6 @@ INSERT INTO t1(b,c) SELECT b,c FROM t2;
UPDATE t2 SET c='2007-01-03';
INSERT INTO t1(b,c) SELECT b,c FROM t2;
set @@sort_buffer_size=8192;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '8192'
SELECT COUNT(*) FROM t1;
COUNT(*)
3072