From 0cc269da52f939ffc6a6272370d113aac9ab5369 Mon Sep 17 00:00:00 2001
From: unknown <gluh@mysql.com/eagle.(none)>
Date: Thu, 13 Dec 2007 18:26:27 +0400
Subject: [PATCH] after merge fix

---
 sql/sql_parse.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 2435c16819f..7c00ac6d1c9 100644
--- 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() */