diff options
Diffstat (limited to 'mysql-test/suite/encryption/t/innodb-spatial-index.test')
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-spatial-index.test | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/mysql-test/suite/encryption/t/innodb-spatial-index.test b/mysql-test/suite/encryption/t/innodb-spatial-index.test index 28b35379a6b..44d547519c6 100644 --- a/mysql-test/suite/encryption/t/innodb-spatial-index.test +++ b/mysql-test/suite/encryption/t/innodb-spatial-index.test @@ -5,22 +5,20 @@ # MDEV-11974: MariaDB 10.2 encryption does not support spatial indexes # -# -# (1) Do not allow creating table with ENCRYPTED=YES -# -# --replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ ---error ER_CANT_CREATE_TABLE CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256), coordinate POINT NOT NULL, SPATIAL index(coordinate)) ENGINE=INNODB ENCRYPTED=YES; +INSERT INTO t1(c, coordinate) values('mysql', ST_GeomFromText('POINT(903994614 180726515)')); +--source include/restart_mysqld.inc +INSERT INTO t1(c, coordinate) values('mariadb', ST_GeomFromText('POINT(903994614 180726515)')); +DROP TABLE t1; # # (2) Alter table # CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256), coordinate POINT NOT NULL, SPATIAL index(coordinate)) ENGINE=INNODB; ---error ER_ILLEGAL_HA_CREATE_OPTION ALTER TABLE t1 ENCRYPTED=YES; DROP TABLE t1; @@ -32,14 +30,10 @@ c VARCHAR(256), coordinate POINT NOT NULL) ENCRYPTED=YES ENGINE=INNODB; # FIXME: MDEV-13851 Encrypted table refuses some form of ALGORITHM=COPY, # but allows rebuild by FORCE --replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ ---error ER_CANT_CREATE_TABLE ALTER TABLE t1 ADD SPATIAL INDEX b(coordinate), ALGORITHM=COPY; ---error ER_ILLEGAL_HA_CREATE_OPTION -ALTER TABLE t1 ADD SPATIAL INDEX b(coordinate), FORCE, ALGORITHM=INPLACE; ---error ER_ILLEGAL_HA_CREATE_OPTION +ALTER TABLE t1 ADD SPATIAL INDEX b1(coordinate), FORCE, ALGORITHM=INPLACE; ALTER TABLE t1 ADD SPATIAL INDEX(coordinate); ---error ER_ILLEGAL_HA_CREATE_OPTION -CREATE SPATIAL INDEX b on t1(coordinate); +CREATE SPATIAL INDEX b2 on t1(coordinate); DROP TABLE t1; CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, @@ -74,4 +68,5 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ --sorted_result SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; +INSERT INTO t1 values(2, 'secret1', ST_GeomFromText('POINT(903994614 180726515)')); DROP TABLE t1, t2; |