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/suite/rpl/r/rpl_extra_col_master_myisam.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/suite/rpl/r/rpl_extra_col_master_myisam.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result index 47e65c1c3c6..cfec03b45d0 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result @@ -643,7 +643,7 @@ c1 c3 hex(c4) c5 c6 ************ connection slave; include/wait_for_slave_sql_error.inc [errno=1091] -Last_SQL_Error = 'Error 'Can't DROP 'c7'; check that constraint/column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'' +Last_SQL_Error = 'Error 'Can't DROP `c7`; check that it exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'' STOP SLAVE; RESET SLAVE; |