Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into sanja.is.com.ua:/home/bell/mysql/bk/work-update-5.0

1 files changed, 5 insertions, 1 deletions

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index bd7f70c5880..3b6aa7594f1 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1315,7 +1315,11 @@ static int mysql_test_multiupdate(Prepared_statement *stmt,
   int res;
   if ((res= multi_update_precheck(stmt->thd, tables)))
     return res;
-  return select_like_statement_test(stmt, tables, &mysql_multi_update_prepare);
+  /*
+    here we do not pass tables for opening, tables will be opened and locked
+    by mysql_multi_update_prepare
+  */
+  return select_like_statement_test(stmt, 0, &mysql_multi_update_prepare);
 }