Kouhei Sutou
null+****@clear*****
Sun Oct 5 22:57:09 JST 2014
Kouhei Sutou 2014-10-05 22:57:09 +0900 (Sun, 05 Oct 2014) New Revision: d22900f3345ca5500fdcd58fb7b4e7ada53ae64e https://github.com/mroonga/mroonga/commit/d22900f3345ca5500fdcd58fb7b4e7ada53ae64e Message: Use ER_DUP_UNIQUE Because MySQL uses it not ER_DUP_ENTRY. Modified files: ha_mroonga.cpp mysql-test/mroonga/storage/alter_table/add_index/unique/r/duplicated.result mysql-test/mroonga/storage/alter_table/add_index/unique/t/duplicated.test Modified: ha_mroonga.cpp (+2 -2) =================================================================== --- ha_mroonga.cpp 2014-10-05 19:25:48 +0900 (c974ca5) +++ ha_mroonga.cpp 2014-10-05 22:57:09 +0900 (60e64ab) @@ -13492,8 +13492,8 @@ bool ha_mroonga::storage_inplace_alter_table_index( grn_table_size(ctx, index_tables[key_pos]) ) { error = HA_ERR_FOUND_DUPP_UNIQUE; - my_printf_error(ER_DUP_ENTRY, ER(ER_DUP_ENTRY_WITH_KEY_NAME), MYF(0), - "*UNKNOWN*", key->name); + my_printf_error(ER_DUP_UNIQUE, ER(ER_DUP_UNIQUE), MYF(0), + table_share->table_name); ++i; break; } Modified: mysql-test/mroonga/storage/alter_table/add_index/unique/r/duplicated.result (+1 -1) =================================================================== --- mysql-test/mroonga/storage/alter_table/add_index/unique/r/duplicated.result 2014-10-05 19:25:48 +0900 (ff82289) +++ mysql-test/mroonga/storage/alter_table/add_index/unique/r/duplicated.result 2014-10-05 22:57:09 +0900 (8b8b2ef) @@ -4,7 +4,7 @@ id INT ) DEFAULT CHARSET UTF8; INSERT INTO ids (id) values (1), (1); ALTER TABLE ids ADD UNIQUE INDEX (id); -ERROR 23000: Duplicate entry '*UNKNOWN*' for key 'id' +ERROR 23000: Can't write, because of unique constraint, to table 'ids' SHOW CREATE TABLE ids; Table Create Table ids CREATE TABLE `ids` ( Modified: mysql-test/mroonga/storage/alter_table/add_index/unique/t/duplicated.test (+1 -1) =================================================================== --- mysql-test/mroonga/storage/alter_table/add_index/unique/t/duplicated.test 2014-10-05 19:25:48 +0900 (566fae8) +++ mysql-test/mroonga/storage/alter_table/add_index/unique/t/duplicated.test 2014-10-05 22:57:09 +0900 (412e7cc) @@ -27,7 +27,7 @@ CREATE TABLE ids ( INSERT INTO ids (id) values (1), (1); ---error ER_DUP_ENTRY +--error ER_DUP_UNIQUE ALTER TABLE ids ADD UNIQUE INDEX (id); SHOW CREATE TABLE ids; -------------- next part -------------- HTML����������������������������...Descargar
