Bug #22908232 A TYPO IN MYSQL_KEYRING_FILE_SERVICE

(cherry picked from commit a8a90724a0dbfe07d78cc4b20747b9317b0c9217)

Author: Robert Golebiowski

include/mysql/service_mysql_keyring.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-extern struct mysql_keyring_file_service_st
+extern struct mysql_keyring_service_st
 {
   int (*my_key_store_func)(const char *, const char *, const char *,
                            const void *, size_t);
@@ -29,21 +29,21 @@ extern struct mysql_keyring_file_service_st
   int (*my_key_remove_func)(const char *, const char *);
   int (*my_key_generate_func)(const char *, const char *, const char *,
                               size_t);
-} *mysql_keyring_file_service;
+} *mysql_keyring_service;
 
 #ifdef MYSQL_DYNAMIC_PLUGIN
 
 #define my_key_store(key_id, key_type, user_id, key, key_len) \
-  mysql_keyring_file_service->my_key_store_func(key_id, key_type, user_id, key, \
-                                                key_len)
+  mysql_keyring_service->my_key_store_func(key_id, key_type, user_id, key, \
+                                           key_len)
 #define my_key_fetch(key_id, key_type, user_id, key, key_len) \
-  mysql_keyring_file_service->my_key_fetch_func(key_id, key_type, user_id, key, \
-                                                key_len)
+  mysql_keyring_service->my_key_fetch_func(key_id, key_type, user_id, key, \
+                                           key_len)
 #define my_key_remove(key_id, user_id) \
-  mysql_keyring_file_service->my_key_remove_func(key_id, user_id)
+  mysql_keyring_service->my_key_remove_func(key_id, user_id)
 #define my_key_generate(key_id, key_type, user_id, key_len) \
-  mysql_keyring_file_service->my_key_generate_func(key_id, key_type, user_id, \
-                                                   key_len)
+  mysql_keyring_service->my_key_generate_func(key_id, key_type, user_id, \
+                                              key_len)
 #else
 
 int my_key_store(const char *, const char *, const char *, const void *, size_t);

include/mysql/services.h.pp

@@ -489,7 +489,7 @@
 int mysql_release_locking_service_locks(void* opaque_thd,
                                         const char* lock_namespace);
 #include <mysql/service_mysql_keyring.h>
-extern struct mysql_keyring_file_service_st
+extern struct mysql_keyring_service_st
 {
   int (*my_key_store_func)(const char *, const char *, const char *,
                            const void *, size_t);
@@ -498,7 +498,7 @@
   int (*my_key_remove_func)(const char *, const char *);
   int (*my_key_generate_func)(const char *, const char *, const char *,
                                   size_t);
-} *mysql_keyring_file_service;
+} *mysql_keyring_service;
 int my_key_store(const char *, const char *, const char *, const void *, size_t);
 int my_key_fetch(const char *, char **, const char *, void **,
                      size_t *);

include/service_versions.h

@@ -35,4 +35,4 @@
 #define VERSION_locking_service 0x0100
 #define VERSION_srv_session_info_service 0x0100
 #define VERSION_srv_session_service      0x0100
-#define VERSION_mysql_keyring_file_service 0x0100
+#define VERSION_mysql_keyring_service 0x0100

libservices/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,8 @@ SET(MYSQLSERVICES_SOURCES
   srv_session_info_service.c
   rpl_transaction_ctx_service.c
   rpl_transaction_write_set_service.c
-  security_context_service.c)
+  security_context_service.c
+  mysql_keyring_service.c)
 
 ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
 INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)

libservices/mysql_keyring_service.c

@@ -0,0 +1,19 @@
+/*  Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; version 2 of the
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include <service_versions.h>
+SERVICE_VERSION *mysql_keyring_service= (void*)VERSION_mysql_keyring_service;
+

sql/sql_plugin_services.h

@@ -153,7 +153,7 @@ static struct security_context_service_st security_context_handler={
 };
 #endif
 
-static struct mysql_keyring_file_service_st mysql_keyring_file_handler= {
+static struct mysql_keyring_service_st mysql_keyring_handler= {
   my_key_store,
   my_key_fetch,
   my_key_remove,
@@ -189,6 +189,6 @@ static struct st_service_ref list_of_services[]=
     VERSION_security_context_service, &security_context_handler },
 #endif
   { "mysql_locking_service", VERSION_locking_service, &locking_service_handler },
-  { "mysql_keyring_service", VERSION_mysql_keyring_file_service, &mysql_keyring_file_handler}
+  { "mysql_keyring_service", VERSION_mysql_keyring_service, &mysql_keyring_handler}
 };