Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
44e6fb3e
Commit
44e6fb3e
authored
Jan 25, 2024
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: generalize ER_INNODB_NO_FT_TEMP_TABLE
parent
f1109b47
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
include/mysql.h
include/mysql.h
+1
-0
mysql-test/suite/innodb_fts/t/basic.inc
mysql-test/suite/innodb_fts/t/basic.inc
+1
-1
sql/share/errmsg-utf8.txt
sql/share/errmsg-utf8.txt
+5
-5
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+2
-1
No files found.
include/mysql.h
View file @
44e6fb3e
...
...
@@ -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 */
...
...
mysql-test/suite/innodb_fts/t/basic.inc
View file @
44e6fb3e
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
),
...
...
sql/share/errmsg-utf8.txt
View file @
44e6fb3e
...
...
@@ -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索引的错误类型"
...
...
storage/innobase/handler/ha_innodb.cc
View file @
44e6fb3e
...
...
@@ -11530,7 +11530,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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment