diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-23 08:43:34 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-23 08:43:34 +0100 |
| commit | 2732fcc608eb98345f79ba805842ab02272d49cf (patch) | |
| tree | e7273c809f44432e5f60a55d5b8f35253d49963d /mysql-test/suite/parts | |
| parent | 131d9a5d0cb51fa88a0461c939dfd2a7c68d5664 (diff) | |
| parent | b8af22af15d159b32256f7d5be8324871ae1a104 (diff) | |
| download | mariadb-git-2732fcc608eb98345f79ba805842ab02272d49cf.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'mysql-test/suite/parts')
| -rw-r--r-- | mysql-test/suite/parts/r/partition_alter_maria.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/parts/t/partition_alter_maria.test | 7 | ||||
| -rw-r--r-- | mysql-test/suite/parts/t/partition_alter_myisam.test | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/suite/parts/r/partition_alter_maria.result b/mysql-test/suite/parts/r/partition_alter_maria.result index 7fed69bb5a5..c7e9028a29c 100644 --- a/mysql-test/suite/parts/r/partition_alter_maria.result +++ b/mysql-test/suite/parts/r/partition_alter_maria.result @@ -16,6 +16,15 @@ select * from t1; pk dt 1 2017-09-28 15:12:00 drop table t1; +create table t1 (a int) engine=Aria transactional=1 partition by hash(a) partitions 2; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) ENGINE=Aria DEFAULT CHARSET=latin1 TRANSACTIONAL=1 + PARTITION BY HASH (`a`) +PARTITIONS 2 +drop table t1; # # MDEV-14641 Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine # diff --git a/mysql-test/suite/parts/t/partition_alter_maria.test b/mysql-test/suite/parts/t/partition_alter_maria.test index e21f0dfab82..e0b9256391d 100644 --- a/mysql-test/suite/parts/t/partition_alter_maria.test +++ b/mysql-test/suite/parts/t/partition_alter_maria.test @@ -17,5 +17,12 @@ alter table t1 drop partition p20181231; select * from t1; drop table t1; +# +# MDEV-13982 Server crashes in in ha_partition::engine_name +# +create table t1 (a int) engine=Aria transactional=1 partition by hash(a) partitions 2; +show create table t1; +drop table t1; + --let $engine=Aria --source inc/part_alter_values.inc diff --git a/mysql-test/suite/parts/t/partition_alter_myisam.test b/mysql-test/suite/parts/t/partition_alter_myisam.test index d3abb8842e1..326cf52b018 100644 --- a/mysql-test/suite/parts/t/partition_alter_myisam.test +++ b/mysql-test/suite/parts/t/partition_alter_myisam.test @@ -1,4 +1,5 @@ --source include/have_partition.inc +--source include/have_symlink.inc --let $engine=MyISAM --source inc/part_alter_values.inc |