diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-06-07 12:47:04 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-06-07 12:47:04 +0400 |
| commit | f29d24b0f88b67504bc701b6f2773a0109ad6154 (patch) | |
| tree | 4268070936d3c9dbd27165b1d9c1593e17ec0d61 /sql/sql_update.cc | |
| parent | 9b5312db1d78247b893066205cffe8b32e0f573d (diff) | |
| parent | 60a9d9bbb94ac03159bcc2d75b649abb1c9dc956 (diff) | |
| download | mariadb-git-f29d24b0f88b67504bc701b6f2773a0109ad6154.tar.gz | |
Manual merge from mysql-trunk-bugfixing.
Conflicts:
- BUILD/SETUP.sh
- mysql-test/mysql-test-run.pl
- mysql-test/r/partition_error.result
- mysql-test/t/disabled.def
- mysql-test/t/partition_error.test
- sql/share/errmsg-utf8.txt
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index fe6e0994959..e7cc133e01b 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1056,7 +1056,7 @@ int mysql_multi_update_prepare(THD *thd) be write-locked (for example, trigger to be invoked might try to update this table). */ - tl->lock_type= read_lock_type_for_table(thd, table); + tl->lock_type= read_lock_type_for_table(thd, lex, tl); tl->updating= 0; /* Update TABLE::lock_type accordingly. */ if (!tl->placeholder() && !using_lock_tables) |