diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-20 22:36:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-20 22:37:24 +0200 |
| commit | 2534b5cb995aeca18cd7cf4db63cddff5f2f6788 (patch) | |
| tree | 039ca2bf8c3ad4cbe7a94c501818dd44f1ad3193 /storage/innobase/dict/dict0load.cc | |
| parent | b4e5d5e2db19967e1e20547a13f388af64879d2d (diff) | |
| parent | 0bc36758ba08ddeea6f7896a0fb815a13a48895a (diff) | |
| download | mariadb-git-2534b5cb995aeca18cd7cf4db63cddff5f2f6788.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index ac1087f1c65..8907a5de7b0 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -1444,7 +1444,7 @@ dict_check_sys_tables( look to see if it is already in the tablespace cache. */ if (fil_space_for_table_exists_in_mem( space_id, table_name.m_name, - false, true, NULL, 0, flags)) { + false, NULL, flags)) { /* Recovery can open a datafile that does not match SYS_DATAFILES. If they don't match, update SYS_DATAFILES. */ @@ -2852,8 +2852,7 @@ dict_load_tablespace( /* The tablespace may already be open. */ if (fil_space_for_table_exists_in_mem( - table->space, space_name, false, - true, heap, table->id, table->flags)) { + table->space, space_name, false, heap, table->flags)) { return; } |