fixup! 937c433

Author: dr-m

plugin/server_audit/server_audit.cc

@@ -1199,6 +1199,9 @@ static void change_connection(struct connection_info *cn,
 
 static int write_log(const char *message, size_t len)
 {
+#if defined _WIN32 || !defined SUX_LOCK_GENERIC
+  DBUG_ASSERT(lock_operations.is_locked_or_waiting());
+#endif
   int result= 0;
 
   if (output_type == OUTPUT_FILE)
@@ -1334,7 +1337,7 @@ static int log_proxy(const struct connection_info *cn,
                      cn->proxy_host_length, cn->proxy_host,
                      event->status);
   message[csize]= '\n';
-  return write_log(message, csize + 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -1361,7 +1364,7 @@ static int log_connection(const struct connection_info *cn,
     ",%.*s,%.*s,%d", cn->db_length, cn->db, (int) obj_len, tls_obj,
     event->status);
   message[csize]= '\n';
-  return write_log(message, csize + 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -1386,7 +1389,7 @@ static int log_connection_event(const struct mysql_event_connection *event,
     ",%.*s,%.*s,%d", (int) event->database.length,event->database.str,
     (int) obj_len, tls_obj, event->status);
   message[csize]= '\n';
-  return write_log(message, csize + 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -1881,7 +1884,7 @@ static int log_table(const struct connection_info *cn,
                      (int) event->database.length, event->database.str,
                      (int) event->table.length, event->table.str);
   message[csize]= '\n';
-  return write_log(message, csize + 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -1907,7 +1910,7 @@ static int log_rename(const struct connection_info *cn,
                       (int) event->new_database.length, event->new_database.str,
                       (int) event->new_table.length, event->new_table.str);
   message[csize]= '\n';
-  return write_log(message, csize + 1);
+  return write_log_and_lock(message, csize + 1);
 }