after merge fix

This commit is contained in:
unknown 2007-12-13 18:26:27 +04:00
parent f7f96cd28d
commit 0cc269da52

View File

@ -487,7 +487,7 @@ end:
(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,
} }
return error; return error;
} }
#endif
/* This works because items are allocated with sql_alloc() */ /* This works because items are allocated with sql_alloc() */