diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index d4316f11491..a3c03fdaf12 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -5771,11 +5771,13 @@ bool setup_tables_and_check_access(THD *thd,
   TABLE_LIST *leaves_tmp= NULL;
   bool first_table= true;
 
+  thd->leaf_count= 0;
   if (setup_tables(thd, context, from_clause, tables,
                    &leaves_tmp, select_insert))
     return TRUE;
 
-  *leaves= leaves_tmp;
+  if (leaves)
+    *leaves= leaves_tmp;
 
   for (; leaves_tmp; leaves_tmp= leaves_tmp->next_leaf)
   {
@@ -5787,6 +5789,7 @@ bool setup_tables_and_check_access(THD *thd,
       return TRUE;
     }
     first_table= 0;
+    thd->leaf_count++;
   }
   return FALSE;
 }