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/include/function_defaults.inc | |
| 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/include/function_defaults.inc')
| -rw-r--r-- | mysql-test/include/function_defaults.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/function_defaults.inc b/mysql-test/include/function_defaults.inc index 8d2387f1cb6..7c5d43b6e74 100644 --- a/mysql-test/include/function_defaults.inc +++ b/mysql-test/include/function_defaults.inc @@ -1058,7 +1058,7 @@ SELECT * FROM v1; --echo # 1970-01-01 03:33:20 SET TIMESTAMP = 2000.000234; ---error ER_CONSTRAINT_FAILED +--error ER_VIEW_CHECK_FAILED UPDATE v1 SET a = 2; SELECT * FROM t1; @@ -1083,7 +1083,7 @@ SELECT * FROM v1; SET TIMESTAMP = 1.126789; ---error ER_CONSTRAINT_FAILED +--error ER_VIEW_CHECK_FAILED INSERT INTO v1 ( c ) VALUES ( 1 ) ON DUPLICATE KEY UPDATE c = 2; SELECT * FROM v1; |