merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6

and a number of fixes to make this buildable. 
Run also few short multi-master high conflict rate tests, with no issues

1 files changed, 12 insertions, 1 deletions

diff --git a/sql/sql_plugin_services.h b/sql/sql_plugin_services.h
index 6b70048345a..362252eee8a 100644
--- a/sql/sql_plugin_services.h
+++ b/sql/sql_plugin_services.h
@@ -64,6 +64,16 @@ static struct my_sha1_service_st my_sha1_handler = {
   my_sha1_multi
 };
 
+static struct logger_service_st logger_service_handler= {
+  logger_init_mutexes,
+  logger_open,
+  logger_close,
+  logger_vprintf,
+  logger_printf,
+  logger_write,
+  logger_rotate
+};
+
 static struct st_service_ref list_of_services[]=
 {
   { "my_snprintf_service",         VERSION_my_snprintf,         &my_snprintf_handler },
@@ -73,6 +83,7 @@ static struct st_service_ref list_of_services[]=
   { "debug_sync_service",          VERSION_debug_sync,          0 }, // updated in plugin_init()
   { "thd_kill_statement_service",  VERSION_kill_statement,      &thd_kill_statement_handler },
   { "thd_timezone_service",        VERSION_thd_timezone,        &thd_timezone_handler },
-  { "my_sha1_service",             VERSION_my_sha1,             &my_sha1_handler}
+  { "my_sha1_service",             VERSION_my_sha1,             &my_sha1_handler},
+  { "logger_service",              VERSION_logger,              &logger_service_handler },
 };