1 files changed, 37 insertions, 18 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 9ca51ebc053..dcb39f8526f 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -23,7 +23,7 @@
 static int check_null_fields(THD *thd,TABLE *entry);
 static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list);
 static int write_delayed(THD *thd,TABLE *table, enum_duplicates dup,
-			 char *query, uint query_length, bool log_on);
+			 char *query, uint query_length, int log_on);
 static void end_delayed_insert(THD *thd);
 extern "C" pthread_handler_decl(handle_delayed_insert,arg);
 static void unlink_blobs(register TABLE *table);
@@ -38,6 +38,8 @@ static void unlink_blobs(register TABLE *table);
 #define my_safe_afree(ptr, size, min_length) if (size > min_length) my_free(ptr,MYF(0))
 #endif
 
+#define DELAYED_LOG_UPDATE 1
+#define DELAYED_LOG_BIN    2
 
 /*
   Check if insert fields are correct
@@ -107,8 +109,13 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
                  enum_duplicates duplic)
 {
   int error;
-  bool log_on= ((thd->options & OPTION_UPDATE_LOG) ||
-		!(thd->master_access & SUPER_ACL));
+  /*
+    log_on is about delayed inserts only.
+    By default, both logs are enabled (this won't cause problems if the server
+    runs without --log-update or --log-bin).
+  */
+  int log_on= DELAYED_LOG_UPDATE | DELAYED_LOG_BIN ;
+
   bool transactional_table, log_delayed, bulk_insert;
   uint value_count;
   ulong counter = 1;
@@ -123,6 +130,14 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
     thd->lex.select_lex.table_list.first;
   DBUG_ENTER("mysql_insert");
 
+  if (thd->master_access & SUPER_ACL)
+  {
+    if (!(thd->options & OPTION_UPDATE_LOG))
+      log_on&= ~(int) DELAYED_LOG_UPDATE;
+    if (!(thd->options & OPTION_BIN_LOG))
+      log_on&= ~(int) DELAYED_LOG_BIN;
+  }
+
   /*
     in safe mode or with skip-new change delayed insert to be regular
     if we are told to replace duplicates, the insert cannot be concurrent
@@ -130,7 +145,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
    */
   if ((lock_type == TL_WRITE_DELAYED &&
        ((specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) ||
-	thd->slave_thread)) ||
+	thd->slave_thread || !max_insert_delayed_threads)) ||
       (lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE) ||
       (duplic == DUP_UPDATE))
     lock_type=TL_WRITE;
@@ -547,12 +562,13 @@ public:
   char *record,*query;
   enum_duplicates dup;
   time_t start_time;
-  bool query_start_used,last_insert_id_used,insert_id_used,log_query;
+  bool query_start_used,last_insert_id_used,insert_id_used;
+  int log_query;
   ulonglong last_insert_id;
   ulong time_stamp;
   uint query_length;
 
-  delayed_row(enum_duplicates dup_arg, bool log_query_arg)
+  delayed_row(enum_duplicates dup_arg, int log_query_arg)
     :record(0),query(0),dup(dup_arg),log_query(log_query_arg) {}
   ~delayed_row()
   {
@@ -855,7 +871,7 @@ TABLE *delayed_insert::get_local_table(THD* client_thd)
 /* Put a question in queue */
 
 static int write_delayed(THD *thd,TABLE *table,enum_duplicates duplic,
-			 char *query, uint query_length, bool log_on)
+			 char *query, uint query_length, int log_on)
 {
   delayed_row *row=0;
   delayed_insert *di=thd->di;
@@ -1242,13 +1258,14 @@ bool delayed_insert::handle_inserts(void)
       using_ignore=0;
       table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
     }
-    if (row->query && row->log_query)
+    if (row->query)
     {
-      mysql_update_log.write(&thd,row->query, row->query_length);
-      if (using_bin_log)
+      if (row->log_query & DELAYED_LOG_UPDATE)
+        mysql_update_log.write(&thd,row->query, row->query_length);
+      if (row->log_query & DELAYED_LOG_BIN && using_bin_log)
       {
-	Query_log_event qinfo(&thd, row->query, row->query_length,0);
-	mysql_bin_log.write(&qinfo);
+        Query_log_event qinfo(&thd, row->query, row->query_length,0);
+        mysql_bin_log.write(&qinfo);
       }
     }
     if (table->blob_fields)
@@ -1399,6 +1416,14 @@ bool select_insert::send_eof()
   if (!(error=table->file->extra(HA_EXTRA_NO_CACHE)))
     error=table->file->activate_all_index(thd);
   table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
+
+  /* Write to binlog before commiting transaction */
+  if (mysql_bin_log.is_open())
+  {
+    Query_log_event qinfo(thd, thd->query, thd->query_length,
+			  table->file->has_transactions());
+    mysql_bin_log.write(&qinfo);
+  }
   if ((error2=ha_autocommit_or_rollback(thd,error)) && ! error)
     error=error2;
   if (info.copied || info.deleted)
@@ -1425,12 +1450,6 @@ bool select_insert::send_eof()
       thd->insert_id(last_insert_id);		// For update log
     ::send_ok(thd,info.copied,last_insert_id,buff);
     mysql_update_log.write(thd,thd->query,thd->query_length);
-    if (mysql_bin_log.is_open())
-    {
-      Query_log_event qinfo(thd, thd->query, thd->query_length,
-			    table->file->has_transactions());
-      mysql_bin_log.write(&qinfo);
-    }
     return 0;
   }
 }