Merge 10.11 into 11.4

plugin/auth_gssapi/gssapi_server.cc

@@ -85,6 +85,15 @@ cleanup:
   return default_name;
 }
 
+static void release_service_name()
+{
+  if (service_name != GSS_C_NO_NAME)
+  {
+    OM_uint32 minor;
+    gss_release_name(&minor, &service_name);
+    service_name=  GSS_C_NO_NAME;
+  }
+}
 
 int plugin_init()
 {
@@ -127,6 +136,7 @@ int plugin_init()
   if (GSS_ERROR(major))
   {
     log_error(major, minor, "gss_acquire_cred failed");
+    release_service_name();
     return -1;
   }
   gss_release_cred(&minor, &cred);
@@ -136,11 +146,7 @@ int plugin_init()
 
 int plugin_deinit()
 {
-  if (service_name != GSS_C_NO_NAME)
-  {
-    OM_uint32 minor;
-    gss_release_name(&minor, &service_name);
-  }
+  release_service_name();
   return 0;
 }
 

plugin/feedback/sender_thread.cc

@@ -290,7 +290,6 @@ pthread_handler_t background_thread(void *arg __attribute__((unused)))
   }
 
   my_thread_end();
-  pthread_exit(0);
   return 0;
 }
 

plugin/handler_socket/CMakeLists.txt

@@ -6,8 +6,6 @@ IF(WIN32 OR WITHOUT_SERVER)
   RETURN()
 ENDIF()
 
-MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-declarations")
-
 INCLUDE_DIRECTORIES(libhsclient)
 
 # Handlersocket client library. We do not distribute it, 

plugin/handler_socket/handlersocket/database.hpp

@@ -9,6 +9,11 @@
 #ifndef DENA_DATABASE_HPP
 #define DENA_DATABASE_HPP
 
+#ifdef __GNUC__
+/* auto_ptr is deprecated */
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include <string>
 #include <memory>
 #include <vector>

plugin/handler_socket/libhsclient/hstcpcli.hpp

@@ -19,6 +19,11 @@
 #include "string_ref.hpp"
 #include "string_buffer.hpp"
 
+#ifdef __GNUC__
+/* auto_ptr is deprecated */
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 namespace dena {
 
 struct hstcpcli_filter {

plugin/server_audit/server_audit.c

@@ -1782,6 +1782,8 @@ static int filter_query_type(const char *query, struct sa_keyword *kwd)
   char fword[MAX_KEYWORD + 1], nword[MAX_KEYWORD + 1];
   int len, nlen= 0;
   const struct sa_keyword *l_keywords;
+  if (!query)
+    return SQLCOM_NOTHING;
 
   while (*query && (is_space(*query) || *query == '(' || *query == '/'))
   {