summaryrefslogtreecommitdiff
path: root/mysql-test/main/partition_innodb.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-01-06 17:43:02 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-01-06 17:43:02 +0200
commit734510a44d690dfb94264e1d2775ee1cb6f3ebb9 (patch)
tree0ccc317bf9462ca95cd1277b4ce65a7fda5fe315 /mysql-test/main/partition_innodb.result
parent2465d3e00b2f18c7d4967f9bb10438883682787d (diff)
parentfaf206a848684bc0f87c93a2b47a55063bbccc6c (diff)
downloadmariadb-git-734510a44d690dfb94264e1d2775ee1cb6f3ebb9.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/partition_innodb.result')
-rw-r--r--mysql-test/main/partition_innodb.result23
1 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/main/partition_innodb.result b/mysql-test/main/partition_innodb.result
index 7d26e5fe216..e91d3767fcc 100644
--- a/mysql-test/main/partition_innodb.result
+++ b/mysql-test/main/partition_innodb.result
@@ -955,6 +955,26 @@ test_jfg test_jfg11
test_jfg test_jfg12#P#p1000
test_jfg test_jfg12#P#pmax
DROP DATABASE test_jfg;
+create table t1 (a int) engine=innodb;
+create table t2 (
+b int,
+c int,
+d bit not null default 0,
+v bit as (d) virtual,
+key (b,v)
+) engine=innodb partition by hash (b);
+insert into t1 values (1),(2);
+insert into t2 (b,c,d) values (1,1,0),(2,2,0);
+explain select t1.* from t1 join t2 on (v = a);
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ALL NULL NULL NULL NULL 2
+1 SIMPLE t2 index NULL b 7 NULL 2 Using where; Using index; Using join buffer (flat, BNL join)
+select t1.* from t1 join t2 on (v = a);
+a
+drop table t1, t2;
+#
+# End of 10.2 tests
+#
#
# MDEV-16241 Assertion `inited==RND' failed in handler::ha_rnd_end()
#
@@ -966,3 +986,6 @@ SELECT COUNT(*) FROM t1 WHERE x IS NULL AND y IS NULL AND z IS NULL;
COUNT(*)
2
DROP TABLE t1;
+#
+# End of 10.3 tests
+#