diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-04 02:52:05 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-04 02:52:05 +0300 |
| commit | a9013f8fbae943dc4d2b5bbd0f8005f0edb3cace (patch) | |
| tree | 6865c45e4fd723b4972eb4705acf049a4d4f9fff /storage/myisammrg | |
| parent | 97abce0e7c3c7948b5b83d661638a20b175ec8bd (diff) | |
| download | mariadb-git-a9013f8fbae943dc4d2b5bbd0f8005f0edb3cace.tar.gz | |
Backport of:
----------------------------------------------------------
revno: 2617.23.20
committer: Konstantin Osipov <kostja@sun.com>
branch nick: mysql-6.0-runtime
timestamp: Wed 2009-03-04 16:31:31 +0300
message:
WL#4284 "Transactional DDL locking"
Review comments: "Objectify" the MDL API.
MDL_request and MDL_context still need manual construction and
destruction, since they are used in environment that is averse
to constructors/destructors.
sql/mdl.cc:
Improve comments.
Add asserts to backup()/restore_from_backup()/merge() methods.
Fix an order bug in the error path of mdl_acquire_exclusive_locks():
we used to first free a ticket object, and only then exclude
it from the list of tickets.
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index b6992256d5a..21a7e2c43d3 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -434,7 +434,7 @@ int ha_myisammrg::add_children_list(void) /* Copy select_lex. Used in unique_table() at least. */ child_l->select_lex= parent_l->select_lex; - child_l->mdl_lock_request= NULL; /* Safety, if alloc_mdl_requests fails. */ + child_l->mdl_request= NULL; /* Safety, if alloc_mdl_requests fails. */ /* Break when this was the last child. */ if (&child_l->next_global == this->children_last_l) |