summaryrefslogtreecommitdiff
path: root/storage/xtradb/pars/pars0pars.cc
diff options
context:
space:
mode:
Diffstat (limited to 'storage/xtradb/pars/pars0pars.cc')
-rw-r--r--storage/xtradb/pars/pars0pars.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/storage/xtradb/pars/pars0pars.cc b/storage/xtradb/pars/pars0pars.cc
index e0bc00fad0d..f051481184b 100644
--- a/storage/xtradb/pars/pars0pars.cc
+++ b/storage/xtradb/pars/pars0pars.cc
@@ -1988,10 +1988,16 @@ pars_create_table(
}
}
+ /* Set the flags2 when create table or alter tables */
+ flags2 |= DICT_TF2_FTS_AUX_HEX_NAME;
+ DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
+ flags2 &= ~DICT_TF2_FTS_AUX_HEX_NAME;);
+
+
n_cols = que_node_list_get_len(column_defs);
table = dict_mem_table_create(
- table_sym->name, 0, n_cols, flags, flags2);
+ table_sym->name, 0, n_cols, flags, flags2, false);
#ifdef UNIV_DEBUG
if (not_fit_in_memory != NULL) {
@@ -2154,8 +2160,9 @@ pars_get_lex_chars(
{
int len;
- len = pars_sym_tab_global->string_len
- - pars_sym_tab_global->next_char_pos;
+ len = static_cast<int>(
+ pars_sym_tab_global->string_len
+ - pars_sym_tab_global->next_char_pos);
if (len == 0) {
#ifdef YYDEBUG
/* fputs("SQL string ends\n", stderr); */