cleanup: sort various lists of services

include/mysql/services.h

@@ -19,24 +19,24 @@
 extern "C" {
 #endif
 
-#include <mysql/service_my_snprintf.h>
-#include <mysql/service_thd_alloc.h>
-#include <mysql/service_thd_wait.h>
-#include <mysql/service_progress_report.h>
+#include <mysql/service_base64.h>
 #include <mysql/service_debug_sync.h>
+#include <mysql/service_encryption.h>
+#include <mysql/service_encryption_scheme.h>
 #include <mysql/service_kill_statement.h>
-#include <mysql/service_thd_timezone.h>
-#include <mysql/service_sha2.h>
-#include <mysql/service_sha1.h>
-#include <mysql/service_md5.h>
-#include <mysql/service_base64.h>
 #include <mysql/service_logger.h>
+#include <mysql/service_md5.h>
+#include <mysql/service_my_snprintf.h>
+#include <mysql/service_progress_report.h>
+#include <mysql/service_sha1.h>
+#include <mysql/service_sha2.h>
+#include <mysql/service_thd_alloc.h>
 #include <mysql/service_thd_autoinc.h>
-#include <mysql/service_thd_rnd.h>
 #include <mysql/service_thd_error_context.h>
+#include <mysql/service_thd_rnd.h>
 #include <mysql/service_thd_specifics.h>
-#include <mysql/service_encryption.h>
-#include <mysql/service_encryption_scheme.h>
+#include <mysql/service_thd_timezone.h>
+#include <mysql/service_thd_wait.h>
 /*#include <mysql/service_wsrep.h>*/
 
 #ifdef __cplusplus

include/service_versions.h

@@ -23,21 +23,20 @@
 #define VERSION_debug_sync              0x1000
 #define VERSION_kill_statement          0x1000
 
+#define VERSION_base64                  0x0100
+#define VERSION_encryption              0x0300
+#define VERSION_encryption_scheme       0x0100
+#define VERSION_logger                  0x0100
+#define VERSION_my_md5                  0x0100
+#define VERSION_my_sha1                 0x0101
+#define VERSION_my_sha2                 0x0100
 #define VERSION_my_snprintf             0x0100
-#define VERSION_thd_alloc               0x0100
-#define VERSION_thd_wait                0x0100
 #define VERSION_progress_report         0x0100
-#define VERSION_thd_timezone            0x0100
-#define VERSION_my_sha2                 0x0100
-#define VERSION_my_sha1                 0x0101
-#define VERSION_my_md5                  0x0100
-#define VERSION_wsrep                   0x0201
-#define VERSION_logger                  0x0100
-#define VERSION_base64                  0x0100
-#define VERSION_thd_rnd                 0x0100
+#define VERSION_thd_alloc               0x0100
 #define VERSION_thd_autoinc             0x0100
 #define VERSION_thd_error_context       0x0100
+#define VERSION_thd_rnd                 0x0100
 #define VERSION_thd_specifics           0x0100
-#define VERSION_encryption              0x0300
-#define VERSION_encryption_scheme       0x0100
-
+#define VERSION_thd_timezone            0x0100
+#define VERSION_thd_wait                0x0100
+#define VERSION_wsrep                   0x0201

libservices/CMakeLists.txt

@@ -16,25 +16,26 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 SET(MYSQLSERVICES_SOURCES
+  base64_service.c
+  debug_sync_service.c
+  encryption_scheme_service.c
+  encryption_service.c
+  kill_statement_service.c
+  logger_service.c
+  my_md5_service.c
+  my_sha1_service.c
+  my_sha2_service.c
   my_snprintf_service.c
+  progress_report_service.c
   thd_alloc_service.c
-  thd_wait_service.c
-  thd_timezone_service.c
   thd_autoinc_service.c
   thd_error_context_service.c
   thd_rnd_service.c
   thd_specifics_service.c
-  progress_report_service.c
-  debug_sync_service.c
-  my_sha2_service.c
-  my_sha1_service.c
-  my_md5_service.c
-  base64_service.c
+  thd_timezone_service.c
+  thd_wait_service.c
   wsrep_service.c
-  encryption_service.c
-  encryption_scheme_service.c
-  kill_statement_service.c
-  logger_service.c)
+)
 
 ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
 INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)

sql/sql_plugin.cc

@@ -1550,8 +1550,8 @@ int plugin_init(int *argc, char **argv, int flags)
   }
 
   /* prepare debug_sync service */
-  DBUG_ASSERT(strcmp(list_of_services[4].name, "debug_sync_service") == 0);
-  list_of_services[4].service= *(void**)&debug_sync_C_callback_ptr;
+  DBUG_ASSERT(strcmp(list_of_services[1].name, "debug_sync_service") == 0);
+  list_of_services[1].service= *(void**)&debug_sync_C_callback_ptr;
 
   /* prepare encryption_keys service */
   finalize_encryption_plugin(0);

sql/sql_plugin_services.ic

@@ -198,24 +198,24 @@ static struct encryption_scheme_service_st encryption_scheme_handler=
 
 static struct st_service_ref list_of_services[]=
 {
+  { "base64_service",              VERSION_base64,              &base64_handler },
+  { "debug_sync_service",          VERSION_debug_sync,          0 }, // updated in plugin_init()
+  { "encryption_scheme_service",   VERSION_encryption_scheme,   &encryption_scheme_handler },
+  { "encryption_service",          VERSION_encryption,          &encryption_handler },
+  { "logger_service",              VERSION_logger,              &logger_service_handler },
+  { "my_md5_service",              VERSION_my_md5,              &my_md5_handler},
+  { "my_sha1_service",             VERSION_my_sha1,             &my_sha1_handler},
+  { "my_sha2_service",             VERSION_my_sha2,             &my_sha2_handler},
   { "my_snprintf_service",         VERSION_my_snprintf,         &my_snprintf_handler },
-  { "thd_alloc_service",           VERSION_thd_alloc,           &thd_alloc_handler },
-  { "thd_wait_service",            VERSION_thd_wait,            &thd_wait_handler },
   { "progress_report_service",     VERSION_progress_report,     &progress_report_handler },
-  { "debug_sync_service",          VERSION_debug_sync,          0 }, // updated in plugin_init()
+  { "thd_alloc_service",           VERSION_thd_alloc,           &thd_alloc_handler },
+  { "thd_autoinc_service",         VERSION_thd_autoinc,         &thd_autoinc_handler },
+  { "thd_error_context_service",   VERSION_thd_error_context,   &thd_error_conext_handler },
   { "thd_kill_statement_service",  VERSION_kill_statement,      &thd_kill_statement_handler },
-  { "thd_timezone_service",        VERSION_thd_timezone,        &thd_timezone_handler },
-  { "my_sha2_service",             VERSION_my_sha2,             &my_sha2_handler},
-  { "my_sha1_service",             VERSION_my_sha1,             &my_sha1_handler},
-  { "my_md5_service",              VERSION_my_md5,              &my_md5_handler},
-  { "logger_service",              VERSION_logger,              &logger_service_handler },
-  { "base64_service",              VERSION_base64,              &base64_handler },
   { "thd_rnd_service",             VERSION_thd_rnd,             &thd_rnd_handler },
-  { "thd_autoinc_service",         VERSION_thd_autoinc,         &thd_autoinc_handler },
-  { "wsrep_service",               VERSION_wsrep,               &wsrep_handler },
-  { "encryption_service",          VERSION_encryption,          &encryption_handler },
-  { "encryption_scheme_service",   VERSION_encryption_scheme,   &encryption_scheme_handler },
   { "thd_specifics_service",       VERSION_thd_specifics,       &thd_specifics_handler },
-  { "thd_error_context_service",   VERSION_thd_error_context,   &thd_error_conext_handler },
+  { "thd_timezone_service",        VERSION_thd_timezone,        &thd_timezone_handler },
+  { "thd_wait_service",            VERSION_thd_wait,            &thd_wait_handler },
+  { "wsrep_service",               VERSION_wsrep,               &wsrep_handler },
 };