database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-12-29 13:23:18 +01:00
parent 48dc7cc66e c13b501162
commit 4a5d25c338
802 changed files with 37504 additions and 15141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb_gis/r/1.result
View File

@ -1066,7 +1066,7 @@ col2 TIMESTAMP
) ENGINE=InnoDB;
CREATE INDEX idx0 ON t1(col0);
Warnings:
Note 1831 Duplicate index 'idx0' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
Note 1831 Duplicate index `idx0`. This is deprecated and will be disallowed in a future release
CREATE TABLE t3 (
col0 INTEGER NOT NULL,
col1 POINT,

2
mysql-test/suite/innodb_gis/r/rtree.result
View File

@ -132,7 +132,7 @@ alter table t1 drop primary key;
create spatial index idx on t1(g);
create spatial index idx2 on t1(g);
Warnings:
Note 1831 Duplicate index 'idx2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
Note 1831 Duplicate index `idx2`. This is deprecated and will be disallowed in a future release
alter table t1 add primary key(i);
show create table t1;
Table Create Table