From e71dbbd54ed1b85857951dbe0477bc7e4279c161 Mon Sep 17 00:00:00 2001
From: "lars/lthalmann@mysql.com/dl145k.mysql.com" <>
Date: Thu, 1 Mar 2007 16:17:48 +0100
Subject: [PATCH] Post-merge fix

---
 sql/sql_insert.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 5a3f0a7b261..f58d08b8dea 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -364,6 +364,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   Name_resolution_context_state ctx_state;
 #ifndef EMBEDDED_LIBRARY
   char *query= thd->query;
+#endif
   /*
     log_on is about delayed inserts only.
     By default, both logs are enabled (this won't cause problems if the server
@@ -371,7 +372,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   */
   bool log_on= ((thd->options & OPTION_BIN_LOG) ||
                 (!(thd->security_ctx->master_access & SUPER_ACL)));
-#endif
   thr_lock_type lock_type = table_list->lock_type;
   Item *unused_conds= 0;
   DBUG_ENTER("mysql_insert");