mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '5.5' into 10.0

Browse source
This commit is contained in:
Sergei Golubchik 2015-05-04 22:00:24 +02:00
commit 49c853fb94
179 changed files with 5739 additions and 1214 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mysql-test/t/subselect_sj.test
View file

@ -2693,5 +2693,16 @@ SET join_cache_level=@tmp_mdev5059;
set optimizer_switch=@tmp_os_mdev5059;
DROP TABLE t1,t2,t3,t4;
--echo #
--echo # MDEV-7911: crash in Item_cond::eval_not_null_tables
--echo #
create table t1(a int);
insert into t1 values(1),(2),(3),(null);
--error ER_CANT_AGGREGATE_2COLLATIONS
explain
select 1 from t1 where _cp932 "1" in (select '1' from t1);
drop table t1;
# The following command must be the last one the file
set optimizer_switch=@subselect_sj_tmp;