diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 19:40:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 19:41:26 +0300 |
| commit | 49373397057aac63b4ce1557c941d508ea87be99 (patch) | |
| tree | f2a8ffb447ef9b4662258e5ed9643e63347122bc | |
| parent | 73e038520f3ee70f7ad575283f4c368eba3104aa (diff) | |
| download | mariadb-git-49373397057aac63b4ce1557c941d508ea87be99.tar.gz | |
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 874f8f30f2319166ff08509937d4eab366607c6b.
| -rw-r--r-- | storage/innobase/handler/i_s.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index db5866ceb6e..79c0fa1aa3f 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -2867,7 +2867,7 @@ i_s_fts_deleted_generic_fill( 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. FIXME: acquire DDL-blocking MDL on the user table name! */ @@ -3277,7 +3277,7 @@ i_s_fts_index_cache_fill( 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. FIXME: acquire DDL-blocking MDL on the user table name! */ @@ -3724,7 +3724,7 @@ i_s_fts_index_table_fill( 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. FIXME: acquire DDL-blocking MDL on the user table name! */ @@ -3887,7 +3887,7 @@ i_s_fts_config_fill( 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. FIXME: acquire DDL-blocking MDL on the user table name! */ |