diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 09:53:42 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 09:53:42 +0100 |
| commit | 2f20d297f8ea731d845bb220e680ad10c7a927bc (patch) | |
| tree | 9bd18ef1ab766422ba4c51b4ab189e259955a2d0 /mysql-test/r/innodb_icp.result | |
| parent | a629b5172e96c96c414fca70fffd64c80f2f7e8f (diff) | |
| parent | eb4f2e063c341d9f3644339c68cb01679e782001 (diff) | |
| download | mariadb-git-2f20d297f8ea731d845bb220e680ad10c7a927bc.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/r/innodb_icp.result')
| -rw-r--r-- | mysql-test/r/innodb_icp.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/innodb_icp.result b/mysql-test/r/innodb_icp.result index bc1c24276ed..1fd388de194 100644 --- a/mysql-test/r/innodb_icp.result +++ b/mysql-test/r/innodb_icp.result @@ -722,8 +722,8 @@ b INT, c INT, d DATE NOT NULL, e VARCHAR(1), KEY (c), KEY (d), KEY k2(b), KEY k3(b), KEY k4(b) ); Warnings: -Note 1831 Duplicate index 'k3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release. -Note 1831 Duplicate index 'k4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release. +Note 1831 Duplicate index `k3`. This is deprecated and will be disallowed in a future release. +Note 1831 Duplicate index `k4`. This is deprecated and will be disallowed in a future release. INSERT INTO t1 (b,c,d,e) VALUES (6,5,'2006-05-25','y'),(1,5,'2008-01-23','t'), (6,5,'2007-06-18','d'),(4,5,'1900-01-01','r'), |