diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
| commit | 93ac7ae70ff000353538f732899b421a3f2ea7ce (patch) | |
| tree | 819b5ca057d80b42699de219c982b7924857c406 /mysql-test/suite/archive | |
| parent | 4932aba921755cfbc351b92c67068a5c48d3922b (diff) | |
| parent | a40de1bdeb218d66d5cc737758a4bab1b06f255d (diff) | |
| download | mariadb-git-93ac7ae70ff000353538f732899b421a3f2ea7ce.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/archive')
| -rw-r--r-- | mysql-test/suite/archive/partition_archive.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/archive/partition_archive.test | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/suite/archive/partition_archive.result b/mysql-test/suite/archive/partition_archive.result index a2e0fe7420f..41be0b31bce 100644 --- a/mysql-test/suite/archive/partition_archive.result +++ b/mysql-test/suite/archive/partition_archive.result @@ -30,7 +30,7 @@ partition by list (a) (partition p0 values in (1), partition p1 values in (2)); insert into t1 values (1), (2); create index inx on t1 (a); -ERROR HY000: Can't create table `db99`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `db99`.`t1` (errno: 140 "Wrong create options") alter table t1 add partition (partition p2 values in (3)); alter table t1 drop partition p2; use test; @@ -141,7 +141,7 @@ t1 CREATE TABLE `t1` ( PARTITION BY HASH (`fld1`) PARTITIONS 5 ALTER TABLE t1 ENGINE= ARCHIVE; -ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options") #After the patch, the ENGINE is correctly displayed as MyISAM SHOW CREATE TABLE t1; Table Create Table diff --git a/mysql-test/suite/archive/partition_archive.test b/mysql-test/suite/archive/partition_archive.test index aa2adb7e44d..dff6ec598d0 100644 --- a/mysql-test/suite/archive/partition_archive.test +++ b/mysql-test/suite/archive/partition_archive.test @@ -47,7 +47,7 @@ engine=archive partition by list (a) (partition p0 values in (1), partition p1 values in (2)); insert into t1 values (1), (2); ---replace_regex /#sql-[0-9a-f_]+/#sql-temporary/ /Not owner/Operation not permitted/ +--replace_regex /Not owner/Operation not permitted/ --error ER_CANT_CREATE_TABLE create index inx on t1 (a); alter table t1 add partition (partition p2 values in (3)); @@ -138,7 +138,6 @@ CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1) PARTITIONS 5; SHOW CREATE TABLE t1; ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ --error ER_CANT_CREATE_TABLE ALTER TABLE t1 ENGINE= ARCHIVE; |