Commit 49373397 authored by Marko Mäkelä's avatar Marko Mäkelä

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 874f8f30.
parent 73e03852
...@@ -2867,7 +2867,7 @@ i_s_fts_deleted_generic_fill( ...@@ -2867,7 +2867,7 @@ i_s_fts_deleted_generic_fill(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
/* Prevent DROP of the internal tables for fulltext indexes. /* Prevent DROP of the internal tables for fulltext indexes.
FIXME: acquire DDL-blocking MDL on the user table name! */ FIXME: acquire DDL-blocking MDL on the user table name! */
...@@ -3277,7 +3277,7 @@ i_s_fts_index_cache_fill( ...@@ -3277,7 +3277,7 @@ i_s_fts_index_cache_fill(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
/* Prevent DROP of the internal tables for fulltext indexes. /* Prevent DROP of the internal tables for fulltext indexes.
FIXME: acquire DDL-blocking MDL on the user table name! */ FIXME: acquire DDL-blocking MDL on the user table name! */
...@@ -3724,7 +3724,7 @@ i_s_fts_index_table_fill( ...@@ -3724,7 +3724,7 @@ i_s_fts_index_table_fill(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
/* Prevent DROP of the internal tables for fulltext indexes. /* Prevent DROP of the internal tables for fulltext indexes.
FIXME: acquire DDL-blocking MDL on the user table name! */ FIXME: acquire DDL-blocking MDL on the user table name! */
...@@ -3887,7 +3887,7 @@ i_s_fts_config_fill( ...@@ -3887,7 +3887,7 @@ i_s_fts_config_fill(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
/* Prevent DROP of the internal tables for fulltext indexes. /* Prevent DROP of the internal tables for fulltext indexes.
FIXME: acquire DDL-blocking MDL on the user table name! */ FIXME: acquire DDL-blocking MDL on the user table name! */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment