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

4
mysql-test/r/innodb_mysql_sync.result
View File

@ -327,7 +327,7 @@ SET DEBUG_SYNC= 'now SIGNAL continue3';
connection default;
# Reaping ALTER TABLE ...
Warnings:
Note 1831 Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
Note 1831 Duplicate index `i2`. This is deprecated and will be disallowed in a future release
SET DEBUG_SYNC= 'RESET';
DELETE FROM t1 WHERE a= 3;
#
@ -377,7 +377,7 @@ SET DEBUG_SYNC= 'now SIGNAL continue4';
connection default;
# Reaping ALTER TABLE ...
Warnings:
Note 1831 Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
Note 1831 Duplicate index `i4`. This is deprecated and will be disallowed in a future release
SET DEBUG_SYNC= 'RESET';
connection default;
disconnect con1;