Commit 5244d7dc authored by gluh@mysql.com/eagle.(none)'s avatar gluh@mysql.com/eagle.(none)
Browse files

after merge fix

parent 3b227392

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ pthread_handler_t handle_bootstrap(void *arg) 
    (CREATE TABLE, ALTER TABLE ... UNION=(...)). Set TL_WRITE for

    every child. Set 'db' for every child if not present.

*/



#ifndef NO_EMBEDDED_ACCESS_CHECKS

static bool check_merge_table_access(THD *thd, char *db,

                                     TABLE_LIST *table_list)

{
@@ -508,7 +508,7 @@ static bool check_merge_table_access(THD *thd, char *db, 
  }

  return error;

}



#endif



/* This works because items are allocated with sql_alloc() */