diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
| commit | 4a5d25c338a5d1d2cc16343380193d6bf25ae6ae (patch) | |
| tree | 73b84a9c8f3d5e3e3383fa79465b11f9ded512d3 /mysql-test/r/innodb_mysql_sync.result | |
| parent | 48dc7cc66ef5b69fcf28ec0b2ecf0338c188cf4e (diff) | |
| parent | c13b5011629b5ff7b969d648265002e4d1ba94c2 (diff) | |
| download | mariadb-git-4a5d25c338a5d1d2cc16343380193d6bf25ae6ae.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/r/innodb_mysql_sync.result')
| -rw-r--r-- | mysql-test/r/innodb_mysql_sync.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/innodb_mysql_sync.result b/mysql-test/r/innodb_mysql_sync.result index 1cfebce6617..a8a264d6580 100644 --- a/mysql-test/r/innodb_mysql_sync.result +++ b/mysql-test/r/innodb_mysql_sync.result @@ -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; |