Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 9eb88e90b6b..e840b5c7072 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1942,6 +1942,17 @@ retry:
   DBUG_PRINT("info", ("real table: %s.%s", d_name, t_name));
   for (TABLE_LIST *tl= table_list;;)
   {
+    if (tl &&
+        tl->select_lex && tl->select_lex->master_unit() &&
+        tl->select_lex->master_unit()->executed)
+    {
+      /*
+        There is no sense to check tables of already executed parts
+        of the query
+      */
+      tl= tl->next_global;
+      continue;
+    }
     /*
       Table is unique if it is present only once in the global list
       of tables and once in the list of table locks.