diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-26 15:46:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 11:43:02 +0200 |
| commit | 99e48cb1d94e2d884b257b13f792323d3d633322 (patch) | |
| tree | 0571ed63973349b091a9b306e2dc472254928a60 /mysql-test/r/function_defaults_innodb.result | |
| parent | c87e002bbb946907b4c9504612b3b3c2a0a19e51 (diff) | |
| download | mariadb-git-99e48cb1d94e2d884b257b13f792323d3d633322.tar.gz | |
restore ER_VIEW_CHECK_FAILED to be different from ER_CONSTRAINT_FAILED
collaterals:
* use %`s, not '%s'
* use correct SQLSTATE codes for these two errors
Diffstat (limited to 'mysql-test/r/function_defaults_innodb.result')
| -rw-r--r-- | mysql-test/r/function_defaults_innodb.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/function_defaults_innodb.result b/mysql-test/r/function_defaults_innodb.result index ee89d847a5c..a877d27dba7 100644 --- a/mysql-test/r/function_defaults_innodb.result +++ b/mysql-test/r/function_defaults_innodb.result @@ -1444,7 +1444,7 @@ a b # 1970-01-01 03:33:20 SET TIMESTAMP = 2000.000234; UPDATE v1 SET a = 2; -ERROR HY000: CONSTRAINT 'WITH CHECK OPTION' failed for 'test.v1' +ERROR 44000: CHECK OPTION failed `test`.`v1` SELECT * FROM t1; a b 1 1970-01-01 03:16:40 @@ -1467,7 +1467,7 @@ a c 1973-08-14 09:11:22 1 SET TIMESTAMP = 1.126789; INSERT INTO v1 ( c ) VALUES ( 1 ) ON DUPLICATE KEY UPDATE c = 2; -ERROR HY000: CONSTRAINT 'WITH CHECK OPTION' failed for 'test.v1' +ERROR 44000: CHECK OPTION failed `test`.`v1` SELECT * FROM v1; a c 1973-08-14 09:11:22 1 @@ -2990,7 +2990,7 @@ a b # 1970-01-01 03:33:20 SET TIMESTAMP = 2000.000234; UPDATE v1 SET a = 2; -ERROR HY000: CONSTRAINT 'WITH CHECK OPTION' failed for 'test.v1' +ERROR 44000: CHECK OPTION failed `test`.`v1` SELECT * FROM t1; a b 1 1970-01-01 03:16:40.123456 @@ -3013,7 +3013,7 @@ a c 1973-08-14 09:11:22.089786 1 SET TIMESTAMP = 1.126789; INSERT INTO v1 ( c ) VALUES ( 1 ) ON DUPLICATE KEY UPDATE c = 2; -ERROR HY000: CONSTRAINT 'WITH CHECK OPTION' failed for 'test.v1' +ERROR 44000: CHECK OPTION failed `test`.`v1` SELECT * FROM v1; a c 1973-08-14 09:11:22.089786 1 |