diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-07-02 14:52:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-07-02 14:52:20 +0200 |
| commit | 5c764a0eb82c87ace0df9744922f27229a7e212a (patch) | |
| tree | 9ecc138a8fc10c6e901099424c048dff92ba493f /storage | |
| parent | 5e3a1ea1e417daf4ed9544221c10d1e605b9bb73 (diff) | |
| download | mariadb-git-5c764a0eb82c87ace0df9744922f27229a7e212a.tar.gz | |
clarify ER_CANT_DROP_FIELD_OR_KEY
include the dropped object type
Diffstat (limited to 'storage')
4 files changed, 5 insertions, 5 deletions
diff --git a/storage/connect/mysql-test/connect/r/xml_mdev5261.result b/storage/connect/mysql-test/connect/r/xml_mdev5261.result index 2a3ecedcb3a..f91194d570c 100644 --- a/storage/connect/mysql-test/connect/r/xml_mdev5261.result +++ b/storage/connect/mysql-test/connect/r/xml_mdev5261.result @@ -19,7 +19,7 @@ SELECT * FROM t1 WHERE i = 5; i 5 ALTER TABLE t1 DROP INDEX i; -ERROR 42000: Can't DROP `i`; check that it exists +ERROR 42000: Can't DROP INDEX `i`; check that it exists DROP INDEX i ON t1; -ERROR 42000: Can't DROP `i`; check that it exists +ERROR 42000: Can't DROP INDEX `i`; check that it exists DROP TABLE t1; diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 71b419b6935..bb7efa104fa 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -3789,7 +3789,7 @@ check_if_ok_to_rename: } my_error(ER_CANT_DROP_FIELD_OR_KEY, MYF(0), - drop->name); + drop->type_name(), drop->name); goto err_exit; found_fk: continue; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result index 4f57368bf8e..58291bc7fd1 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result @@ -636,7 +636,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 it exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'' +Last_SQL_Error = 'Error 'Can't DROP COLUMN `c7`; check that it exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'' STOP SLAVE; RESET SLAVE; diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index 68d80d2bff0..5724d9fe8ff 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -3803,7 +3803,7 @@ check_if_ok_to_rename: } my_error(ER_CANT_DROP_FIELD_OR_KEY, MYF(0), - drop->name); + drop->type_name(), drop->name); goto err_exit; found_fk: continue; |