Commit 0cc269da authored by unknown's avatar unknown

after merge fix

parent f7f96cd2
...@@ -487,7 +487,7 @@ pthread_handler_t handle_bootstrap(void *arg) ...@@ -487,7 +487,7 @@ pthread_handler_t handle_bootstrap(void *arg)
(CREATE TABLE, ALTER TABLE ... UNION=(...)). Set TL_WRITE for (CREATE TABLE, ALTER TABLE ... UNION=(...)). Set TL_WRITE for
every child. Set 'db' for every child if not present. 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, static bool check_merge_table_access(THD *thd, char *db,
TABLE_LIST *table_list) TABLE_LIST *table_list)
{ {
...@@ -508,7 +508,7 @@ static bool check_merge_table_access(THD *thd, char *db, ...@@ -508,7 +508,7 @@ static bool check_merge_table_access(THD *thd, char *db,
} }
return error; return error;
} }
#endif
/* This works because items are allocated with sql_alloc() */ /* This works because items are allocated with sql_alloc() */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment