mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Post-merge fix
This commit is contained in:

parent
17d00e3c6b
commit
e71dbbd54e
@@ -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");
|
||||
|
Reference in New Issue
Block a user