Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik 2016-12-11 09:53:42 +01:00
commit 2f20d297f8
150 changed files with 2247 additions and 567 deletions

View file

@ -1763,3 +1763,9 @@ drop function f1;
#
--error ER_TABLE_MUST_HAVE_COLUMNS
create table t1;
#
# MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECT
#
create table t1 (i int, j int, key(i), key(i)) as select 1 as i, 2 as j;
drop table t1;