diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-01 17:39:03 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-01 17:39:03 +0300 |
| commit | 1523cea6e9f3b93f7c94036228084bd711a0d9a0 (patch) | |
| tree | 289ce39f293fe8250f3dac5ac3d34c4e90909125 /sql/lock.cc | |
| parent | 801ef812ba08174852c05f254a28a585cf0438dd (diff) | |
| download | mariadb-git-1523cea6e9f3b93f7c94036228084bd711a0d9a0.tar.gz | |
Backport of:
----------------------------------------------------------
revno: 2630.4.26
committer: Konstantin Osipov <konstantin@mysql.com>
branch nick: mysql-6.0-prelocked_mode-to-push
timestamp: Fri 2008-06-06 23:19:04 +0400
message:
WL#3726: work on review comments.
Remove thd->locked_tables. Always store MYSQL_LOCK instances in
thd->lock.
Rename thd->prelocked_mode to thd->locked_tables_mode.
Use thd->locked_tables_mode to determine if we
are under LOCK TABLES. Update the code to not assume that
if thd->lock is set, LOCK TABLES mode is off.
Review comments.
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index f391b323a59..33c9edcea48 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -754,7 +754,7 @@ TABLE_LIST *mysql_lock_have_duplicate(THD *thd, TABLE_LIST *needle, goto end; /* Get command lock or LOCK TABLES lock. Maybe empty for INSERT DELAYED. */ - if (! (mylock= thd->lock ? thd->lock : thd->locked_tables)) + if (! (mylock= thd->lock)) goto end; /* If we have less than two tables, we cannot have duplicates. */ |