Commit 9f9e2f2d authored by unknown's avatar unknown
Browse files

merging

parent 3e75a5ce

sql/sql_base.cc

+4 −1
Original line number Diff line number Diff line
@@ -5771,10 +5771,12 @@ 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;



  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;

}