Merge branch '10.1' into 10.2

1 files changed, 55 insertions, 11 deletions

diff --git a/sql/sql_plugin_services.ic b/sql/sql_plugin_services.ic
index c3dfde18ab6..2e71fac50be 100644
--- a/sql/sql_plugin_services.ic
+++ b/sql/sql_plugin_services.ic
@@ -60,6 +60,33 @@ static struct thd_timezone_service_st thd_timezone_handler= {
   thd_gmt_sec_to_TIME
 };
 
+static struct my_sha2_service_st my_sha2_handler = {
+  my_sha224,
+  my_sha224_multi,
+  my_sha224_context_size,
+  my_sha224_init,
+  my_sha224_input,
+  my_sha224_result,
+  my_sha256,
+  my_sha256_multi,
+  my_sha256_context_size,
+  my_sha256_init,
+  my_sha256_input,
+  my_sha256_result,
+  my_sha384,
+  my_sha384_multi,
+  my_sha384_context_size,
+  my_sha384_init,
+  my_sha384_input,
+  my_sha384_result,
+  my_sha512,
+  my_sha512_multi,
+  my_sha512_context_size,
+  my_sha512_init,
+  my_sha512_input,
+  my_sha512_result,
+};
+
 static struct my_sha1_service_st my_sha1_handler = {
   my_sha1,
   my_sha1_multi,
@@ -92,6 +119,20 @@ static struct thd_autoinc_service_st thd_autoinc_handler= {
   thd_get_autoinc
 };
 
+static struct thd_rnd_service_st thd_rnd_handler= {
+  thd_rnd,
+  thd_create_random_password
+};
+
+static struct base64_service_st base64_handler= {
+  my_base64_needed_encoded_length,
+  my_base64_encode_max_arg_length,
+  my_base64_needed_decoded_length,
+  my_base64_decode_max_arg_length,
+  my_base64_encode,
+  my_base64_decode
+};
+
 static struct thd_error_context_service_st thd_error_conext_handler= {
   thd_get_error_message,
   thd_get_error_number,
@@ -157,21 +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_rnd_service",             VERSION_thd_rnd,             &thd_rnd_handler },
+  { "thd_specifics_service",       VERSION_thd_specifics,       &thd_specifics_handler },
   { "thd_timezone_service",        VERSION_thd_timezone,        &thd_timezone_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 },
-  { "thd_autoinc_service",         VERSION_thd_autoinc,         &thd_autoinc_handler },
+  { "thd_wait_service",            VERSION_thd_wait,            &thd_wait_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 },
 };