database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-01-06 17:43:02 +02:00
parent 2465d3e00b faf206a848
commit 734510a44d
155 changed files with 2039 additions and 2610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/main/partition_innodb.result
View File

@ -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
#