summaryrefslogtreecommitdiff
path: root/mysql-test/suite/pbxt/r/subselect.result
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-11-25 20:55:52 +0200
committerMichael Widenius <monty@askmonty.org>2010-11-25 20:55:52 +0200
commit40b7efb354a3d3a87535c22e1c883033f751950c (patch)
treea375b5113c0824a9b0e0f87af160163fcc26bce8 /mysql-test/suite/pbxt/r/subselect.result
parentf900b6581021d119376660e6a65166cd74de0a5d (diff)
downloadmariadb-git-40b7efb354a3d3a87535c22e1c883033f751950c.tar.gz
Fixed failing test cases
mysql-test/include/have_not_innodb_plugin.inc: Also detect if xtradb is installed mysql-test/suite/innodb/t/innodb_bug56143.test: Disabled test case that doesn't work for innodb_plugin/xtradb. mysql-test/suite/innodb_plugin/r/innodb_bug56632.result: Updated result (key_block_size is lower case in MariaDB, as all other options) mysql-test/suite/pbxt/r/partition_hash.result: Updated results (after partition row count optimization changes) mysql-test/suite/pbxt/r/partition_pruning.result: Updated results (after partition row count optimization changes) mysql-test/suite/pbxt/r/partition_range.result: Updated results (after partition row count optimization changes) mysql-test/suite/pbxt/r/subselect.result: Updated result after ROW() changes.
Diffstat (limited to 'mysql-test/suite/pbxt/r/subselect.result')
-rw-r--r--mysql-test/suite/pbxt/r/subselect.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/pbxt/r/subselect.result b/mysql-test/suite/pbxt/r/subselect.result
index 69f8e2534f7..ebe74e442a2 100644
--- a/mysql-test/suite/pbxt/r/subselect.result
+++ b/mysql-test/suite/pbxt/r/subselect.result
@@ -922,7 +922,7 @@ select a, (select a,b,c from t1 where t1.a=t2.a) = ROW(a,2,'a'),(select c from t
a (select a,b,c from t1 where t1.a=t2.a) = ROW(a,2,'a') (select c from t1 where a=t2.a)
1 1 a
2 0 b
-NULL 0 NULL
+NULL NULL NULL
select a, (select a,b,c from t1 where t1.a=t2.a) = ROW(a,3,'b'),(select c from t1 where a=t2.a) from t2;
a (select a,b,c from t1 where t1.a=t2.a) = ROW(a,3,'b') (select c from t1 where a=t2.a)
1 0 a
@@ -932,7 +932,7 @@ select a, (select a,b,c from t1 where t1.a=t2.a) = ROW(a,4,'c'),(select c from t
a (select a,b,c from t1 where t1.a=t2.a) = ROW(a,4,'c') (select c from t1 where a=t2.a)
1 0 a
2 0 b
-NULL 0 NULL
+NULL NULL NULL
drop table t1,t2;
create table t1 (a int, b real, c varchar(10));
insert into t1 values (1, 1, 'a'), (2,2,'b'), (NULL, 2, 'b');