Merge of maria/5.5 into maria-5.5-galera.

bzr merge -r tag:mariadb-5.5.35 maria/5.5

1 files changed, 4 insertions, 1 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 953b59031d8..4d20dde3610 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1973,7 +1973,9 @@ void clean_up(bool print_message)
   delete binlog_filter;
   delete rpl_filter;
   end_ssl();
+#ifndef EMBEDDED_LIBRARY
   vio_end();
+#endif /*!EMBEDDED_LIBRARY*/
   my_regex_end();
 #if defined(ENABLED_DEBUG_SYNC)
   /* End the debug sync facility. See debug_sync.cc. */
@@ -3309,7 +3311,6 @@ void my_message_sql(uint error, const char *str, myf MyFlags)
   DBUG_ASSERT(str != NULL);
   DBUG_ASSERT(error != 0);
 
-  mysql_audit_general(thd, MYSQL_AUDIT_GENERAL_ERROR, error, str);
   if (MyFlags & ME_JUST_INFO)
   {
     level= MYSQL_ERROR::WARN_LEVEL_NOTE;
@@ -3332,6 +3333,8 @@ void my_message_sql(uint error, const char *str, myf MyFlags)
       thd->is_fatal_error= 1;
     (void) thd->raise_condition(error, NULL, level, str);
   }
+  else
+    mysql_audit_general(0, MYSQL_AUDIT_GENERAL_ERROR, error, str);
 
   /* When simulating OOM, skip writing to error log to avoid mtr errors */
   DBUG_EXECUTE_IF("simulate_out_of_memory", DBUG_VOID_RETURN;);