mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup: generalize ER_INNODB_NO_FT_TEMP_TABLE

Browse source
This commit is contained in:
Sergei Golubchik 2024-01-25 11:36:59 +01:00
parent fd69abe44f
commit 1fe8a1bb76
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mysql.h
View file

@ -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_KEY_COLUMN_DOES_NOT_EXITS ER_KEY_COLUMN_DOES_NOT_EXIST
#define ER_DROP_PARTITION_NON_EXISTENT ER_PARTITION_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_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 { typedef struct st_mysql_rows {
struct st_mysql_rows *next; /* list of rows */ struct st_mysql_rows *next; /* list of rows */

2
mysql-test/suite/innodb_fts/t/basic.inc
View file

@ -1,7 +1,7 @@
if ($basic_stage == create_table) if ($basic_stage == create_table)
{ {
# Create FTS table # Create FTS table
--error ER_INNODB_NO_FT_TEMP_TABLE --error ER_NO_INDEX_ON_TEMPORARY
CREATE TEMPORARY TABLE articles ( CREATE TEMPORARY TABLE articles (
id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY, id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
title VARCHAR(200), title VARCHAR(200),

10
sql/share/errmsg-utf8.txt
View file

@ -9601,11 +9601,11 @@ ER_INNODB_FT_LIMIT
spa "Actualmente InnoDB soporta la creación de un índice FULLTEXT a la vez" 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" sw "InnoDB kwa sasa inaruhusu uundaji wa faharasa moja ya FULLTEXT kwa wakati mmoja"
ER_INNODB_NO_FT_TEMP_TABLE ER_NO_INDEX_ON_TEMPORARY
chi "无法在临时InnoDB表上创建FullText索引" chi "无法在临时%2$s表上创建%1$s索引"
eng "Cannot create FULLTEXT index on temporary InnoDB table" eng "Cannot create %s index on temporary %s table"
spa "No puedo crear índice FULLTEXT en tabla temporaria InnoDB" spa "No puedo crear índice %s en tabla temporaria %s"
sw "Haiwezi kuunda faharisi ya FULLTEXT kwenye jedwali la muda la InnoDB" sw "Haiwezi kuunda faharisi ya %s kwenye jedwali la muda la %s"
ER_INNODB_FT_WRONG_DOCID_COLUMN ER_INNODB_FT_WRONG_DOCID_COLUMN
chi "列'%-.192s'是innodb fulltext索引的错误类型" chi "列'%-.192s'是innodb fulltext索引的错误类型"

3
storage/innobase/handler/ha_innodb.cc
View file

@ -11499,7 +11499,8 @@ bool create_table_info_t::innobase_table_flags()
/* We don't support FTS indexes in temporary /* We don't support FTS indexes in temporary
tables. */ tables. */
if (is_temp) { 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); DBUG_RETURN(false);
} }