Merge 10.2 into 10.2-mdev9864.

18 files changed, 43 insertions, 53 deletions

diff --git a/plugin/auth_gssapi/README.md b/plugin/auth_gssapi/README.md
index 7f678400f0d..b2c17353fc5 100644
--- a/plugin/auth_gssapi/README.md
+++ b/plugin/auth_gssapi/README.md
@@ -124,6 +124,6 @@ Send resulting GSSAPI blob to server.
 
 3. Server : receive blob from client, execute ```gss_accept_sec_context()/ AcceptSecurityContext()```, send resulting blob back to client
 
-4. Perform  2. and 3. can until both client and server decide that authentication is done, or until some error occured. If authentication was successful, GSSAPI context (an opaque structure) is generated on both client and server sides.
+4. Perform  2. and 3. can until both client and server decide that authentication is done, or until some error occurred. If authentication was successful, GSSAPI context (an opaque structure) is generated on both client and server sides.
 
 5. Server : Client name is extracted from the context, and compared to the name provided by client(with or without realm). If name matches, plugin returns success.
diff --git a/plugin/auth_gssapi/server_plugin.cc b/plugin/auth_gssapi/server_plugin.cc
index a79074abe79..0c0bcbbbb72 100644
--- a/plugin/auth_gssapi/server_plugin.cc
+++ b/plugin/auth_gssapi/server_plugin.cc
@@ -177,7 +177,7 @@ maria_declare_plugin(gssapi_server)
   NULL,                                  /* status variables */
   system_variables,                      /* system variables */
   "1.0",
-  MariaDB_PLUGIN_MATURITY_BETA
+  MariaDB_PLUGIN_MATURITY_STABLE
 }
 maria_declare_plugin_end;
 
diff --git a/plugin/auth_pam/mapper/pam_user_map.c b/plugin/auth_pam/mapper/pam_user_map.c
index fb149c5cc05..229a844d5c9 100644
--- a/plugin/auth_pam/mapper/pam_user_map.c
+++ b/plugin/auth_pam/mapper/pam_user_map.c
@@ -15,7 +15,7 @@ auth            required        pam_user_map.so
   in the format:  orig_user_name: mapped_user_name
                   @user's_group_name: mapped_user_name
 =========================================================
-#comments and emtpy lines are ignored
+#comments and empty lines are ignored
 john: jack
 bob:  admin
 top:  accounting
@@ -71,6 +71,7 @@ static int populate_user_groups(const char *user, gid_t **groups)
 static int user_in_group(const gid_t *user_groups, int ng,const char *group)
 {
   gid_t group_id;
+  const gid_t *groups_end = user_groups + ng;
 
   {
     struct group *g= getgrnam(group);
@@ -79,7 +80,7 @@ static int user_in_group(const gid_t *user_groups, int ng,const char *group)
     group_id= g->gr_gid;
   }
 
-  for (; user_groups < user_groups + ng; user_groups++)
+  for (; user_groups < groups_end; user_groups++)
   {
     if (*user_groups == group_id)
       return 1;
@@ -146,7 +147,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
       goto ret;
     }
   }
-  pam_err= PAM_SUCCESS;
+  pam_err= PAM_AUTH_ERR;
   goto ret;
 
 syntax_error:
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt
index 97bcfbb04db..e414b9e6ad8 100644
--- a/plugin/aws_key_management/CMakeLists.txt
+++ b/plugin/aws_key_management/CMakeLists.txt
@@ -10,7 +10,7 @@
 
 
 # Give message why the building this plugin is skipped (only if -DVERBOSE is defined)
-# or if plugin is explicitely requested to build. Then bail out.
+# or if plugin is explicitly requested to build. Then bail out.
 MACRO(SKIP_AWS_PLUGIN msg)
   IF(VERBOSE OR "${PLUGIN_AWS_KEY_MANAGEMENT}" MATCHES "^(STATIC|DYNAMIC)$")
     MESSAGE(STATUS "Skip aws_key_management - ${msg}")
diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc
index f7b9f440fcd..16cdfe5574a 100644
--- a/plugin/feedback/sender_thread.cc
+++ b/plugin/feedback/sender_thread.cc
@@ -89,9 +89,8 @@ static int prepare_for_fill(TABLE_LIST *tables)
     (every increment of global thread_id counts as a new connection
     in SHOW STATUS and we want to avoid skewing the statistics)
   */
-  thd->thread_id= thd->variables.pseudo_thread_id= thd_thread_id;
+  thd->variables.pseudo_thread_id= thd->thread_id;
   mysql_mutex_lock(&LOCK_thread_count);
-  thread_count++;
   threads.append(thd);
   mysql_mutex_unlock(&LOCK_thread_count);
   thd->thread_stack= (char*) &tables;
@@ -205,10 +204,10 @@ static void send_report(const char *when)
     /*
       otherwise, prepare the THD and TABLE_LIST,
       create and fill the temporary table with data just like
-      SELECT * FROM IFROEMATION_SCHEMA.feedback is doing,
+      SELECT * FROM INFORMATION_SCHEMA.feedback is doing,
       read and concatenate table data into a String.
     */
-    if (!(thd= new THD()))
+    if (!(thd= new THD(thd_thread_id)))
       return;
 
     if (prepare_for_fill(&tables))
@@ -263,7 +262,6 @@ ret:
     */
     mysql_mutex_lock(&LOCK_thread_count);
     thd->set_status_var_init();
-    thread_count--;
     thd->killed= KILL_CONNECTION;
     thd->unlink();
     mysql_cond_broadcast(&COND_thread_count);
diff --git a/plugin/feedback/url_http.cc b/plugin/feedback/url_http.cc
index d04ff6fa9d5..cec3f60505c 100644
--- a/plugin/feedback/url_http.cc
+++ b/plugin/feedback/url_http.cc
@@ -190,6 +190,7 @@ int Url_http::send(const char* data, size_t data_length)
       break;
 
     closesocket(fd);
+    fd= INVALID_SOCKET;
   }
 
   freeaddrinfo(addrs);
diff --git a/plugin/handler_socket/client/hslongrun.cpp b/plugin/handler_socket/client/hslongrun.cpp
index e82c12b166b..b7c02951340 100644
--- a/plugin/handler_socket/client/hslongrun.cpp
+++ b/plugin/handler_socket/client/hslongrun.cpp
@@ -39,7 +39,7 @@ struct auto_mysql : private noncopyable {
       mysql_close(db);
     }
     if ((db = mysql_init(0)) == 0) {
-      fatal_exit("failed to initialize mysql client");
+      fatal_abort("failed to initialize mysql client");
     }
   }
   operator MYSQL *() const { return db; }
@@ -870,7 +870,7 @@ mysql_do(MYSQL *db, const char *query)
 {
   if (mysql_real_query(db, query, strlen(query)) != 0) {
     fprintf(stderr, "mysql: e=[%s] q=[%s]\n", mysql_error(db), query);
-    fatal_exit("mysql_do");
+    fatal_abort("mysql_do");
   }
 }
 
@@ -886,7 +886,7 @@ hs_longrun_init_table(const config& conf, int num_prepare,
   if (!mysql_real_connect(db, mysql_host.c_str(), mysql_user.c_str(),
     mysql_passwd.c_str(), mysql_dbname.c_str(), mysql_port, 0, 0)) {
     fprintf(stderr, "mysql: error=[%s]\n", mysql_error(db));
-    fatal_exit("hs_longrun_init_table");
+    fatal_abort("hs_longrun_init_table");
   }
   mysql_do(db, "drop database if exists hstestdb");
   mysql_do(db, "create database hstestdb");
diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp
index 94eedbf6d04..4292b826753 100644
--- a/plugin/handler_socket/handlersocket/database.cpp
+++ b/plugin/handler_socket/handlersocket/database.cpp
@@ -278,7 +278,7 @@ dbcontext::init_thread(const void *stack_bottom, volatile int& shutdown_flag)
   DBG_THR(fprintf(stderr, "HNDSOCK init thread\n"));
   {
     my_thread_init();
-    thd = new THD;
+    thd = new THD(0);
     thd->thread_stack = (char *)stack_bottom;
     DBG_THR(fprintf(stderr,
       "thread_stack = %p sizeof(THD)=%zu sizeof(mtx)=%zu "
@@ -310,7 +310,6 @@ dbcontext::init_thread(const void *stack_bottom, volatile int& shutdown_flag)
   }
   {
     thd->thread_id = next_thread_id();
-    thread_safe_increment32(&thread_count);
     add_to_active_threads(thd);
   }
 
@@ -348,7 +347,6 @@ dbcontext::term_thread()
     pthread_mutex_lock(&LOCK_thread_count);
     delete thd;
     thd = 0;
-    --thread_count;
     pthread_mutex_unlock(&LOCK_thread_count);
     my_thread_end();
   }
diff --git a/plugin/handler_socket/libhsclient/fatal.cpp b/plugin/handler_socket/libhsclient/fatal.cpp
index 5cdd8879ab1..8e109cf13ba 100644
--- a/plugin/handler_socket/libhsclient/fatal.cpp
+++ b/plugin/handler_socket/libhsclient/fatal.cpp
@@ -18,14 +18,6 @@ namespace dena {
 const int opt_syslog = LOG_ERR | LOG_PID | LOG_CONS;
 
 void
-fatal_exit(const std::string& message)
-{
-  fprintf(stderr, "FATAL_EXIT: %s\n", message.c_str());
-  syslog(opt_syslog, "FATAL_EXIT: %s", message.c_str());
-  _exit(1);
-}
-
-void
 fatal_abort(const std::string& message)
 {
   fprintf(stderr, "FATAL_COREDUMP: %s\n", message.c_str());
diff --git a/plugin/handler_socket/libhsclient/fatal.hpp b/plugin/handler_socket/libhsclient/fatal.hpp
index 8a630fab1cb..5eaa3db8687 100644
--- a/plugin/handler_socket/libhsclient/fatal.hpp
+++ b/plugin/handler_socket/libhsclient/fatal.hpp
@@ -13,7 +13,6 @@
 
 namespace dena {
 
-void fatal_exit(const std::string& message);
 void fatal_abort(const std::string& message);
 
 };
diff --git a/plugin/handler_socket/libhsclient/socket.cpp b/plugin/handler_socket/libhsclient/socket.cpp
index cf19d4bbe14..2c93a3b4846 100644
--- a/plugin/handler_socket/libhsclient/socket.cpp
+++ b/plugin/handler_socket/libhsclient/socket.cpp
@@ -43,7 +43,7 @@ socket_args::set(const config& conf)
     } else {
       const char *nd = node.empty() ? 0 : node.c_str();
       if (resolve(nd, port.c_str()) != 0) {
-	fatal_exit("getaddrinfo failed: " + node + ":" + port);
+	fatal_abort("getaddrinfo failed: " + node + ":" + port);
       }
     }
   }
diff --git a/plugin/metadata_lock_info/metadata_lock_info.cc b/plugin/metadata_lock_info/metadata_lock_info.cc
index 83db2c7ca5c..6a9f6ef3f6c 100644
--- a/plugin/metadata_lock_info/metadata_lock_info.cc
+++ b/plugin/metadata_lock_info/metadata_lock_info.cc
@@ -81,25 +81,17 @@ int i_s_metadata_lock_info_fill_row(
   THD *thd = param->thd;
   TABLE *table = param->table;
   DBUG_ENTER("i_s_metadata_lock_info_fill_row");
-  MDL_request mdl_request;
-  enum_mdl_duration mdl_duration;
   MDL_context *mdl_ctx = mdl_ticket->get_ctx();
   enum_mdl_type mdl_ticket_type = mdl_ticket->get_type();
   MDL_key *mdl_key = mdl_ticket->get_key();
   MDL_key::enum_mdl_namespace mdl_namespace = mdl_key->mdl_namespace();
-  mdl_request.init(mdl_key, mdl_ticket_type, MDL_STATEMENT);
-  mdl_ctx->find_ticket(&mdl_request, &mdl_duration);
   table->field[0]->store((longlong) mdl_ctx->get_thread_id(), TRUE);
   table->field[1]->set_notnull();
   table->field[1]->store(
     metadata_lock_info_lock_mode[(int) mdl_ticket_type].str,
     metadata_lock_info_lock_mode[(int) mdl_ticket_type].length,
     system_charset_info);
-  table->field[2]->set_notnull();
-  table->field[2]->store(
-    metadata_lock_info_duration[(int) mdl_duration].str,
-    metadata_lock_info_duration[(int) mdl_duration].length,
-    system_charset_info);
+  table->field[2]->set_null();
   table->field[3]->set_notnull();
   table->field[3]->store(
     metadata_lock_info_lock_name[(int) mdl_namespace].str,
@@ -131,6 +123,14 @@ int i_s_metadata_lock_info_fill_table(
 static int i_s_metadata_lock_info_init(
   void *p
 ) {
+
+  compile_time_assert(sizeof(metadata_lock_info_lock_name)/sizeof(LEX_STRING)
+                      == MDL_key::NAMESPACE_END);
+  compile_time_assert(sizeof(metadata_lock_info_lock_mode)/sizeof(LEX_STRING)
+                      == MDL_TYPE_END);
+  compile_time_assert(sizeof(metadata_lock_info_duration)/sizeof(LEX_STRING)
+                      == MDL_DURATION_END);
+
   ST_SCHEMA_TABLE *schema = (ST_SCHEMA_TABLE *) p;
   DBUG_ENTER("i_s_metadata_lock_info_init");
   schema->fields_info = i_s_metadata_lock_info_fields_info;
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/global_read_lock.result b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/global_read_lock.result
index 9840aeecf97..5803d7d1290 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/global_read_lock.result
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/global_read_lock.result
@@ -3,8 +3,8 @@ lock_mode	lock_duration	lock_type	table_schema	table_name
 FLUSH TABLES WITH READ LOCK;
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 lock_mode	lock_duration	lock_type	table_schema	table_name
-MDL_SHARED	MDL_EXPLICIT	Global read lock		
-MDL_SHARED	MDL_EXPLICIT	Commit lock		
+MDL_SHARED	NULL	Commit lock		
+MDL_SHARED	NULL	Global read lock		
 UNLOCK TABLES;
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 lock_mode	lock_duration	lock_type	table_schema	table_name
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/table_metadata_lock.result b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/table_metadata_lock.result
index 280c8284c54..1b76b9e8222 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/table_metadata_lock.result
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/table_metadata_lock.result
@@ -6,7 +6,7 @@ SELECT * FROM t1;
 a
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 lock_mode	lock_duration	lock_type	table_schema	table_name
-MDL_SHARED_READ	MDL_TRANSACTION	Table metadata lock	test	t1
+MDL_SHARED_READ	NULL	Table metadata lock	test	t1
 ROLLBACK;
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 lock_mode	lock_duration	lock_type	table_schema	table_name
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
index e1d690b566c..34d238cb43b 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
@@ -5,7 +5,7 @@ GET_LOCK('LOCK1',0)
 1
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 lock_mode	lock_duration	lock_type	table_schema	table_name
-MDL_SHARED_NO_WRITE	MDL_EXPLICIT	User lock	LOCK1	
+MDL_SHARED_NO_WRITE	NULL	User lock	LOCK1	
 SELECT RELEASE_LOCK('LOCK1');
 RELEASE_LOCK('LOCK1')
 1
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/global_read_lock.test b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/global_read_lock.test
index f221191255e..103050e3fb8 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/global_read_lock.test
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/global_read_lock.test
@@ -1,5 +1,6 @@
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 FLUSH TABLES WITH READ LOCK;
+--sorted_result
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 UNLOCK TABLES;
 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
diff --git a/plugin/query_response_time/mysql-test/query_response_time/basic.result b/plugin/query_response_time/mysql-test/query_response_time/basic.result
index 86fba87e056..673201266ec 100644
--- a/plugin/query_response_time/mysql-test/query_response_time/basic.result
+++ b/plugin/query_response_time/mysql-test/query_response_time/basic.result
@@ -7,7 +7,7 @@ SHOW CREATE TABLE INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 Table	Create Table
 QUERY_RESPONSE_TIME	CREATE TEMPORARY TABLE `QUERY_RESPONSE_TIME` (
   `TIME` varchar(14) NOT NULL DEFAULT '',
-  `COUNT` int(11) unsigned NOT NULL DEFAULT '0',
+  `COUNT` int(11) unsigned NOT NULL DEFAULT 0,
   `TOTAL` varchar(14) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE, PLUGIN_AUTHOR, PLUGIN_DESCRIPTION, PLUGIN_LICENSE, PLUGIN_MATURITY FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%';;
diff --git a/plugin/user_variables/user_variables.cc b/plugin/user_variables/user_variables.cc
index c6c48d09303..981c39cdb86 100644
--- a/plugin/user_variables/user_variables.cc
+++ b/plugin/user_variables/user_variables.cc
@@ -21,23 +21,23 @@
 
 static const LEX_CSTRING result_types[]=
 {
-  STRING_WITH_LEN("VARCHAR"),
-  STRING_WITH_LEN("DOUBLE"),
-  STRING_WITH_LEN("INT"),
-  STRING_WITH_LEN("<IMPOSSIBLE1>"), // ROW_RESULT
-  STRING_WITH_LEN("DECIMAL"),
-  STRING_WITH_LEN("<IMPOSSIBLE2>") // TIME_RESULT
+  { STRING_WITH_LEN("VARCHAR") },
+  { STRING_WITH_LEN("DOUBLE") },
+  { STRING_WITH_LEN("INT") },
+  { STRING_WITH_LEN("<IMPOSSIBLE1>") }, // ROW_RESULT
+  { STRING_WITH_LEN("DECIMAL") },
+  { STRING_WITH_LEN("<IMPOSSIBLE2>")} // TIME_RESULT
 };
 
 
 static const LEX_CSTRING unsigned_result_types[]=
 {
-  STRING_WITH_LEN("<IMPOSSIBLE3>"), // UNSIGNED STRING_RESULT
-  STRING_WITH_LEN("DOUBLE UNSIGNED"),
-  STRING_WITH_LEN("INT UNSIGNED"),
-  STRING_WITH_LEN("<IMPOSSIBLE4>"), // UNSIGNED ROW_RESULT
-  STRING_WITH_LEN("DECIMAL UNSIGNED"),
-  STRING_WITH_LEN("<IMPOSSIBLE5>") // UNSIGNED TIME_RESULT
+  { STRING_WITH_LEN("<IMPOSSIBLE3>") }, // UNSIGNED STRING_RESULT
+  { STRING_WITH_LEN("DOUBLE UNSIGNED") },
+  { STRING_WITH_LEN("INT UNSIGNED") },
+  { STRING_WITH_LEN("<IMPOSSIBLE4>") }, // UNSIGNED ROW_RESULT
+  { STRING_WITH_LEN("DECIMAL UNSIGNED") },
+  { STRING_WITH_LEN("<IMPOSSIBLE5>") } // UNSIGNED TIME_RESULT
 };