diff --git a/include/mysql.h b/include/mysql.h index c54dc7e5f5f..9eac4b410f9 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -144,6 +144,7 @@ typedef unsigned long long my_ulonglong; #define ER_KEY_COLUMN_DOES_NOT_EXITS ER_KEY_COLUMN_DOES_NOT_EXIST #define ER_DROP_PARTITION_NON_EXISTENT ER_PARTITION_DOES_NOT_EXIST #define ER_SPATIAL_CANT_HAVE_NULL ER_INDEX_CANNOT_HAVE_NULL +#define ER_INNODB_NO_FT_TEMP_TABLE ER_NO_INDEX_ON_TEMPORARY typedef struct st_mysql_rows { struct st_mysql_rows *next; /* list of rows */ diff --git a/mysql-test/suite/innodb_fts/t/basic.inc b/mysql-test/suite/innodb_fts/t/basic.inc index fd7d09208bc..81cb2a77fe0 100644 --- a/mysql-test/suite/innodb_fts/t/basic.inc +++ b/mysql-test/suite/innodb_fts/t/basic.inc @@ -1,7 +1,7 @@ if ($basic_stage == create_table) { # Create FTS table ---error ER_INNODB_NO_FT_TEMP_TABLE +--error ER_NO_INDEX_ON_TEMPORARY CREATE TEMPORARY TABLE articles ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY, title VARCHAR(200), diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 5820e011e1f..7eb2ed4fee3 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -9601,11 +9601,11 @@ ER_INNODB_FT_LIMIT spa "Actualmente InnoDB soporta la creación de un índice FULLTEXT a la vez" sw "InnoDB kwa sasa inaruhusu uundaji wa faharasa moja ya FULLTEXT kwa wakati mmoja" -ER_INNODB_NO_FT_TEMP_TABLE - chi "无法在临时InnoDB表上创建FullText索引" - eng "Cannot create FULLTEXT index on temporary InnoDB table" - spa "No puedo crear índice FULLTEXT en tabla temporaria InnoDB" - sw "Haiwezi kuunda faharisi ya FULLTEXT kwenye jedwali la muda la InnoDB" +ER_NO_INDEX_ON_TEMPORARY + chi "无法在临时%2$s表上创建%1$s索引" + eng "Cannot create %s index on temporary %s table" + spa "No puedo crear índice %s en tabla temporaria %s" + sw "Haiwezi kuunda faharisi ya %s kwenye jedwali la muda la %s" ER_INNODB_FT_WRONG_DOCID_COLUMN chi "列'%-.192s'是innodb fulltext索引的错误类型" diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 62a5d49ef8d..c21892ea5f0 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -11499,7 +11499,8 @@ bool create_table_info_t::innobase_table_flags() /* We don't support FTS indexes in temporary tables. */ if (is_temp) { - my_error(ER_INNODB_NO_FT_TEMP_TABLE, MYF(0)); + my_error(ER_NO_INDEX_ON_TEMPORARY, MYF(0), + "FULLTEXT", "InnoDB"); DBUG_RETURN(false); }