Skip to content

Commit bfab4ab

Browse files
committed
MDEV-18867 fixup: Remove DBUG injection
In commit 75e82f7 the code to rename internal tables for FULLTEXT INDEX that had been created on Microsoft Windows using incompatible names was removed. Let us also remove the related fault injection.
1 parent b4de67d commit bfab4ab

File tree

5 files changed

+0
-33
lines changed

5 files changed

+0
-33
lines changed

storage/innobase/dict/dict0crea.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,6 @@ dict_build_table_def_step(
354354

355355
/* Always set this bit for all new created tables */
356356
DICT_TF2_FLAG_SET(table, DICT_TF2_FTS_AUX_HEX_NAME);
357-
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
358-
DICT_TF2_FLAG_UNSET(table,
359-
DICT_TF2_FTS_AUX_HEX_NAME););
360357

361358
if (DICT_TF2_FLAG_IS_SET(table, DICT_TF2_USE_FILE_PER_TABLE)) {
362359
/* This table will need a new tablespace. */

storage/innobase/handler/ha_innodb.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12185,8 +12185,6 @@ bool create_table_info_t::innobase_table_flags()
1218512185

1218612186
/* Set the flags2 when create table or alter tables */
1218712187
m_flags2 |= DICT_TF2_FTS_AUX_HEX_NAME;
12188-
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
12189-
m_flags2 &= ~DICT_TF2_FTS_AUX_HEX_NAME;);
1219012188

1219112189
DBUG_RETURN(true);
1219212190
}

storage/innobase/include/fts0priv.inl

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,6 @@ fts_write_object_id(
3434
ib_id_t id, /* in: a table/index id */
3535
char* str) /* in: buffer to write the id to */
3636
{
37-
38-
#ifdef _WIN32
39-
40-
DBUG_EXECUTE_IF("innodb_test_wrong_non_windows_fts_aux_table_name",
41-
return(sprintf(str, UINT64PFx, id)););
42-
43-
/* Use this to construct old(5.6.14 and 5.7.3) windows
44-
ambiguous aux table names */
45-
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
46-
return(sprintf(str, "%016llu", (ulonglong) id)););
47-
48-
#else /* _WIN32 */
49-
50-
/* Use this to construct old(5.6.14 and 5.7.3) windows
51-
ambiguous aux table names */
52-
DBUG_EXECUTE_IF("innodb_test_wrong_windows_fts_aux_table_name",
53-
return(sprintf(str, "%016llu", (ulonglong) id)););
54-
55-
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
56-
return(sprintf(str, "%016llx", (ulonglong) id)););
57-
58-
#endif /* _WIN32 */
59-
6037
return(sprintf(str, "%016llx", (ulonglong) id));
6138
}
6239

storage/innobase/pars/pars0pars.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,9 +1777,6 @@ pars_create_table(
17771777
ulint flags = 0;
17781778
ulint flags2 = DICT_TF2_FTS_AUX_HEX_NAME;
17791779

1780-
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
1781-
flags2 &= ~DICT_TF2_FTS_AUX_HEX_NAME;);
1782-
17831780
n_cols = que_node_list_get_len(column_defs);
17841781

17851782
table = dict_mem_table_create(

storage/innobase/row/row0ftsort.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,8 +1657,6 @@ row_fts_merge_insert(
16571657
/* We should set the flags2 with aux_table_name here,
16581658
in order to get the correct aux table names. */
16591659
index->table->flags2 |= DICT_TF2_FTS_AUX_HEX_NAME;
1660-
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
1661-
index->table->flags2 &= ~DICT_TF2_FTS_AUX_HEX_NAME;);
16621660
fts_table.type = FTS_INDEX_TABLE;
16631661
fts_table.index_id = index->id;
16641662
fts_table.table_id = table->id;

0 commit comments

Comments
 (0)