diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
| commit | 139a2b64bf8ec2e248656835e23a5c98ffc667a8 (patch) | |
| tree | 7d77d6f1073f8090f275b30cb3f10254497da243 /sql/lock.cc | |
| parent | b3f7eac5301529c2d069ebe4d0558980412af3a2 (diff) | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-139a2b64bf8ec2e248656835e23a5c98ffc667a8.tar.gz | |
Merge with 5.2
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 4cab521fada..740b54f9153 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -928,7 +928,8 @@ MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, for ( ; locks_start != locks ; locks_start++) { (*locks_start)->debug_print_param= (void *) table; - (*locks_start)->org_type= (*locks_start)->type; + (*locks_start)->lock->name= table->alias.c_ptr(); + (*locks_start)->org_type= (*locks_start)->type; } } } |