Skip to content

Commit 4937339

Browse files
committed
MDEV-19445: After-merge fix
Pass a correct string pointer to RETURN_IF_INNODB_NOT_STARTED. This was caught on Windows. The error was introduced in the merge commit 874f8f3.
1 parent 73e0385 commit 4937339

File tree

1 file changed

+4
-4
lines changed
  • storage/innobase/handler

1 file changed

+4
-4
lines changed

storage/innobase/handler/i_s.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2867,7 +2867,7 @@ i_s_fts_deleted_generic_fill(
28672867
DBUG_RETURN(0);
28682868
}
28692869

2870-
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
2870+
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
28712871

28722872
/* Prevent DROP of the internal tables for fulltext indexes.
28732873
FIXME: acquire DDL-blocking MDL on the user table name! */
@@ -3277,7 +3277,7 @@ i_s_fts_index_cache_fill(
32773277
DBUG_RETURN(0);
32783278
}
32793279

3280-
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
3280+
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
32813281

32823282
/* Prevent DROP of the internal tables for fulltext indexes.
32833283
FIXME: acquire DDL-blocking MDL on the user table name! */
@@ -3724,7 +3724,7 @@ i_s_fts_index_table_fill(
37243724
DBUG_RETURN(0);
37253725
}
37263726

3727-
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
3727+
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
37283728

37293729
/* Prevent DROP of the internal tables for fulltext indexes.
37303730
FIXME: acquire DDL-blocking MDL on the user table name! */
@@ -3887,7 +3887,7 @@ i_s_fts_config_fill(
38873887
DBUG_RETURN(0);
38883888
}
38893889

3890-
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
3890+
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
38913891

38923892
/* Prevent DROP of the internal tables for fulltext indexes.
38933893
FIXME: acquire DDL-blocking MDL on the user table name! */

0 commit comments

Comments
 (0)