bk commit into 5.1 tree (lars:1.2474)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-01 16:17:48+01:00, lars@stripped +1 -0
  Post-merge fix

  sql/sql_insert.cc@stripped, 2007-03-01 16:17:45+01:00, lars@stripped +1 -1
    Post-merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145k.mysql.com
# Root:	/nfsdisk1/lars/bk/mysql-5.1-new-rpl

--- 1.254/sql/sql_insert.cc	2007-03-01 16:17:56 +01:00
+++ 1.255/sql/sql_insert.cc	2007-03-01 16:17:56 +01:00
@@ -364,6 +364,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *t
   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 *t
   */
   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");