diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-07-02 20:43:35 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-07-02 20:43:35 +0300 |
| commit | 99aae21ed25b42ee3cf62815ecfc8204de8b6fd0 (patch) | |
| tree | ac9a51c525b3ad668a7c8dbde44e34e14771c512 /storage/myisammrg | |
| parent | b7b2a7ce81bf9d1bbcac9e0b3b0b19e271f2c276 (diff) | |
| download | mariadb-git-99aae21ed25b42ee3cf62815ecfc8204de8b6fd0.tar.gz | |
mdl_sync now works.
mysql-test/r/mdl_sync.result:
Full merge with 5.6
mysql-test/t/mdl_sync.test:
Full merge with 5.6
sql/debug_sync.cc:
Full merge with 5.6
sql/debug_sync.h:
Full merge with 5.6
sql/mdl.cc:
Full merge with 5.6
sql/sql_base.cc:
Removed code not in 5.6 anymore
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index d919fb59502..7772b0bb15e 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -512,7 +512,7 @@ int ha_myisammrg::add_children_list(void) DDL on implicitly locked underlying tables of a MERGE table. */ if (! thd->locked_tables_mode && - parent_l->mdl_request.type == MDL_SHARED_NO_WRITE) + parent_l->mdl_request.type == MDL_SHARED_UPGRADABLE) child_l->mdl_request.set_type(MDL_SHARED_NO_WRITE); /* Link TABLE_LIST object into the children list. */ if (this->children_last_l) @@ -1372,8 +1372,6 @@ int ha_myisammrg::reset(void) int ha_myisammrg::extra_opt(enum ha_extra_function operation, ulong cache_size) { DBUG_ASSERT(this->file->children_attached); - if ((specialflag & SPECIAL_SAFE_MODE) && operation == HA_EXTRA_WRITE_CACHE) - return 0; return myrg_extra(file, operation, (void*) &cache_size); } |