after merge fix

5244d7dc · gluh@mysql.com/eagle.(none) · 3b227392 · 5244d7dc
Commit 5244d7dc authored Dec 13, 2007 by gluh@mysql.com/eagle.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +2 -2

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -487,7 +487,7 @@ end:
    (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() */