summaryrefslogtreecommitdiff
path: root/mysql-test/suite/pbxt
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-12-24 08:17:43 -0800
committerIgor Babaev <igor@askmonty.org>2010-12-24 08:17:43 -0800
commit7d68e1ead7be84fd6476854c8b4ff02ef16ea7d4 (patch)
tree4cfe18466b680dfcb50da9bc9760f3e13606df4f /mysql-test/suite/pbxt
parent6c958d6e80f681c207f4298b754c8b18170d3224 (diff)
parent6f2db629a0b251e141bc29f2f1c3e3ac99a4eaa5 (diff)
downloadmariadb-git-7d68e1ead7be84fd6476854c8b4ff02ef16ea7d4.tar.gz
Merge: mwl#24+mwl#21 5.1->5.2
Diffstat (limited to 'mysql-test/suite/pbxt')
-rw-r--r--mysql-test/suite/pbxt/r/subselect.result4
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/suite/pbxt/r/subselect.result b/mysql-test/suite/pbxt/r/subselect.result
index ebe74e442a2..b68654db911 100644
--- a/mysql-test/suite/pbxt/r/subselect.result
+++ b/mysql-test/suite/pbxt/r/subselect.result
@@ -3667,8 +3667,6 @@ CREATE TABLE t1 (a int, b int auto_increment, PRIMARY KEY (b));
CREATE TABLE t2 (x int auto_increment, y int, z int,
PRIMARY KEY (x), FOREIGN KEY (y) REFERENCES t1 (b));
SET SESSION sort_buffer_size = 32 * 1024;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32768'
SELECT SQL_NO_CACHE COUNT(*)
FROM (SELECT a, b, (SELECT x FROM t2 WHERE y=b ORDER BY z DESC LIMIT 1) c
FROM t1) t;
@@ -4104,8 +4102,6 @@ INSERT INTO `t1` VALUES ('asdf','2007-02-08 01:11:26');
INSERT INTO `t2` VALUES ('abcdefghijk');
INSERT INTO `t2` VALUES ('asdf');
SET session sort_buffer_size=8192;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '8192'
SELECT (SELECT 1 FROM t1 WHERE t1.a=t2.a ORDER BY t1.b LIMIT 1) AS d1 FROM t2;
d1
1