diff options
| author | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2007-03-01 16:17:48 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2007-03-01 16:17:48 +0100 |
| commit | 17b3cbe81b1b22382198279497c90071499d5b08 (patch) | |
| tree | aeeec2025af974250c499d2fdb61c00a97d0ac21 /sql/sql_insert.cc | |
| parent | e95a62a737dba410a1e9fb23ad8d979a04d3d1ac (diff) | |
| download | mariadb-git-17b3cbe81b1b22382198279497c90071499d5b08.tar.gz | |
Post-merge fix
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |