Merge branch '10.10' into 10.11

7 files changed, 221 insertions, 110 deletions

diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_26541.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_26541.result
new file mode 100644
index 00000000000..b2edaff6918
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_26541.result
@@ -0,0 +1,20 @@
+#
+# MDEV-26541 Undefined symbol: _ZTI12ha_partition when attempting to use ha_spider.so in UBSAN builds
+#
+INSTALL PLUGIN spider SONAME 'ha_spider.so';
+DROP FUNCTION spider_flush_table_mon_cache;
+DROP FUNCTION spider_copy_tables;
+DROP FUNCTION spider_ping_table;
+DROP FUNCTION spider_bg_direct_sql;
+DROP FUNCTION spider_direct_sql;
+UNINSTALL PLUGIN spider_alloc_mem;
+UNINSTALL PLUGIN spider;
+DROP TABLE IF EXISTS mysql.spider_xa;
+DROP TABLE IF EXISTS mysql.spider_xa_member;
+DROP TABLE IF EXISTS mysql.spider_xa_failed_log;
+DROP TABLE IF EXISTS mysql.spider_tables;
+DROP TABLE IF EXISTS mysql.spider_link_mon_servers;
+DROP TABLE IF EXISTS mysql.spider_link_failed_log;
+DROP TABLE IF EXISTS mysql.spider_table_position_for_recovery;
+DROP TABLE IF EXISTS mysql.spider_table_sts;
+DROP TABLE IF EXISTS mysql.spider_table_crd;
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_30370.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_30370.result
new file mode 100644
index 00000000000..df0f6949280
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_30370.result
@@ -0,0 +1,3 @@
+#
+# MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
+#
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_26541.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_26541.test
new file mode 100644
index 00000000000..ffd99390748
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26541.test
@@ -0,0 +1,40 @@
+--echo #
+--echo # MDEV-26541 Undefined symbol: _ZTI12ha_partition when attempting to use ha_spider.so in UBSAN builds
+--echo #
+
+if (`select not(count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value="UBSAN"`)
+{
+--skip test needs to be run with UBSAN
+}
+
+# init spider
+
+INSTALL PLUGIN spider SONAME 'ha_spider.so';
+
+let $PLUGIN_NAME= spider_flush_table_mon_cache;
+let $PLUGIN_EXIST=
+  `SELECT COUNT(*) FROM mysql.func WHERE name = '$PLUGIN_NAME'`;
+while (!$PLUGIN_EXIST)
+{
+  let $PLUGIN_EXIST=
+    `SELECT COUNT(*) FROM mysql.func WHERE name = '$PLUGIN_NAME'`;
+}
+
+# deinit spider
+
+DROP FUNCTION spider_flush_table_mon_cache;
+DROP FUNCTION spider_copy_tables;
+DROP FUNCTION spider_ping_table;
+DROP FUNCTION spider_bg_direct_sql;
+DROP FUNCTION spider_direct_sql;
+UNINSTALL PLUGIN spider_alloc_mem;
+UNINSTALL PLUGIN spider;
+DROP TABLE IF EXISTS mysql.spider_xa;
+DROP TABLE IF EXISTS mysql.spider_xa_member;
+DROP TABLE IF EXISTS mysql.spider_xa_failed_log;
+DROP TABLE IF EXISTS mysql.spider_tables;
+DROP TABLE IF EXISTS mysql.spider_link_mon_servers;
+DROP TABLE IF EXISTS mysql.spider_link_failed_log;
+DROP TABLE IF EXISTS mysql.spider_table_position_for_recovery;
+DROP TABLE IF EXISTS mysql.spider_table_sts;
+DROP TABLE IF EXISTS mysql.spider_table_crd;
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_30370.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_30370.test
new file mode 100644
index 00000000000..788ea2323f7
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_30370.test
@@ -0,0 +1,5 @@
+--echo #
+--echo # MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
+--echo #
+
+--exec $MYSQLD_BOOTSTRAP_CMD --wsrep-recover --plugin-load-add=ha_spider.so
diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc
index a1d80ae8670..0f252012bd9 100644
--- a/storage/spider/spd_conn.cc
+++ b/storage/spider/spd_conn.cc
@@ -460,18 +460,25 @@ SPIDER_CONN *spider_create_conn(
     conn->tgt_host = tmp_host;
     memcpy(conn->tgt_host, share->tgt_hosts[link_idx],
       share->tgt_hosts_lengths[link_idx]);
+
     conn->tgt_username_length = share->tgt_usernames_lengths[link_idx];
     conn->tgt_username = tmp_username;
-    memcpy(conn->tgt_username, share->tgt_usernames[link_idx],
-      share->tgt_usernames_lengths[link_idx]);
+    if (conn->tgt_username_length)
+      memcpy(conn->tgt_username, share->tgt_usernames[link_idx],
+             share->tgt_usernames_lengths[link_idx]);
+
     conn->tgt_password_length = share->tgt_passwords_lengths[link_idx];
     conn->tgt_password = tmp_password;
-    memcpy(conn->tgt_password, share->tgt_passwords[link_idx],
-      share->tgt_passwords_lengths[link_idx]);
+    if (conn->tgt_password_length)
+      memcpy(conn->tgt_password, share->tgt_passwords[link_idx],
+             share->tgt_passwords_lengths[link_idx]);
+
     conn->tgt_socket_length = share->tgt_sockets_lengths[link_idx];
     conn->tgt_socket = tmp_socket;
-    memcpy(conn->tgt_socket, share->tgt_sockets[link_idx],
-      share->tgt_sockets_lengths[link_idx]);
+    if (conn->tgt_socket_length)
+      memcpy(conn->tgt_socket, share->tgt_sockets[link_idx],
+             share->tgt_sockets_lengths[link_idx]);
+
     conn->tgt_wrapper_length = share->tgt_wrappers_lengths[link_idx];
     conn->tgt_wrapper = tmp_wrapper;
     memcpy(conn->tgt_wrapper, share->tgt_wrappers[link_idx],
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
index f3761c62556..46dba6abdc9 100644
--- a/storage/spider/spd_table.cc
+++ b/storage/spider/spd_table.cc
@@ -8935,6 +8935,7 @@ void spider_free_sts_threads(
 ) {
   bool thread_killed;
   DBUG_ENTER("spider_free_sts_threads");
+  spider_thread->init_command = FALSE;
   pthread_mutex_lock(&spider_thread->mutex);
   thread_killed = spider_thread->killed;
   spider_thread->killed = TRUE;
@@ -9072,12 +9073,13 @@ void *spider_table_bg_sts_action(
     tmp_disable_binlog(thd);
     thd->security_ctx->skip_grants();
     thd->client_capabilities |= CLIENT_MULTI_RESULTS;
-    if (!(*spd_mysqld_server_started) && !thd->killed)
+    if (!(*spd_mysqld_server_started) && !thd->killed && !thread->killed)
     {
       pthread_mutex_lock(spd_LOCK_server_started);
       thd->mysys_var->current_cond = spd_COND_server_started;
       thd->mysys_var->current_mutex = spd_LOCK_server_started;
-      if (!(*spd_mysqld_server_started) && !thd->killed)
+      if (!(*spd_mysqld_server_started) && !thd->killed && !thread->killed &&
+        thread->init_command)
       {
         do
         {
@@ -9087,14 +9089,16 @@ void *spider_table_bg_sts_action(
             spd_LOCK_server_started, &abstime);
         } while (
           (error_num == ETIMEDOUT || error_num == ETIME) &&
-          !(*spd_mysqld_server_started) && !thd->killed && !thread->killed
+          !(*spd_mysqld_server_started) && !thd->killed && !thread->killed &&
+          thread->init_command
         );
       }
       pthread_mutex_unlock(spd_LOCK_server_started);
       thd->mysys_var->current_cond = &thread->cond;
       thd->mysys_var->current_mutex = &thread->mutex;
     }
-    while (spider_init_queries[i].length && !thd->killed && !thread->killed)
+    while (spider_init_queries[i].length && !thd->killed && !thread->killed &&
+      thread->init_command)
     {
       dispatch_command(COM_QUERY, thd, spider_init_queries[i].str,
         (uint) spider_init_queries[i].length);
diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc
index c61aeaf5028..f266b27c871 100644
--- a/storage/spider/spd_trx.cc
+++ b/storage/spider/spd_trx.cc
@@ -625,103 +625,136 @@ int spider_create_trx_alter_table(
   alter_table->tmp_tgt_drivers_lengths = tmp_tgt_drivers_lengths;
   alter_table->tmp_static_link_ids_lengths = tmp_static_link_ids_lengths;
 
+  size_t len;
   for(roop_count = 0; roop_count < (int) share->all_link_count; roop_count++)
   {
-    tmp_server_names[roop_count] = tmp_server_names_char;
-    memcpy(tmp_server_names_char,
-      share_alter->tmp_server_names[roop_count],
-      sizeof(char) * share_alter->tmp_server_names_lengths[roop_count]);
-    tmp_server_names_char +=
-      share_alter->tmp_server_names_lengths[roop_count] + 1;
-
-    tmp_tgt_table_names[roop_count] = tmp_tgt_table_names_char;
-    memcpy(tmp_tgt_table_names_char,
-      share_alter->tmp_tgt_table_names[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_table_names_lengths[roop_count]);
-    tmp_tgt_table_names_char +=
-      share_alter->tmp_tgt_table_names_lengths[roop_count] + 1;
-
-    tmp_tgt_dbs[roop_count] = tmp_tgt_dbs_char;
-    memcpy(tmp_tgt_dbs_char, share_alter->tmp_tgt_dbs[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_dbs_lengths[roop_count]);
-    tmp_tgt_dbs_char +=
-      share_alter->tmp_tgt_dbs_lengths[roop_count] + 1;
-
-    tmp_tgt_hosts[roop_count] = tmp_tgt_hosts_char;
-    memcpy(tmp_tgt_hosts_char, share_alter->tmp_tgt_hosts[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_hosts_lengths[roop_count]);
-    tmp_tgt_hosts_char +=
-      share_alter->tmp_tgt_hosts_lengths[roop_count] + 1;
-
-    tmp_tgt_usernames[roop_count] = tmp_tgt_usernames_char;
-    memcpy(tmp_tgt_usernames_char, share_alter->tmp_tgt_usernames[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_usernames_lengths[roop_count]);
-    tmp_tgt_usernames_char +=
-      share_alter->tmp_tgt_usernames_lengths[roop_count] + 1;
-
-    tmp_tgt_passwords[roop_count] = tmp_tgt_passwords_char;
-    memcpy(tmp_tgt_passwords_char, share_alter->tmp_tgt_passwords[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_passwords_lengths[roop_count]);
-    tmp_tgt_passwords_char +=
-      share_alter->tmp_tgt_passwords_lengths[roop_count] + 1;
-
-    tmp_tgt_sockets[roop_count] = tmp_tgt_sockets_char;
-    memcpy(tmp_tgt_sockets_char, share_alter->tmp_tgt_sockets[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_sockets_lengths[roop_count]);
-    tmp_tgt_sockets_char +=
-      share_alter->tmp_tgt_sockets_lengths[roop_count] + 1;
-
-    tmp_tgt_wrappers[roop_count] = tmp_tgt_wrappers_char;
-    memcpy(tmp_tgt_wrappers_char, share_alter->tmp_tgt_wrappers[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_wrappers_lengths[roop_count]);
-    tmp_tgt_wrappers_char +=
-      share_alter->tmp_tgt_wrappers_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_cas[roop_count] = tmp_tgt_ssl_cas_char;
-    memcpy(tmp_tgt_ssl_cas_char, share_alter->tmp_tgt_ssl_cas[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_cas_lengths[roop_count]);
-    tmp_tgt_ssl_cas_char +=
-      share_alter->tmp_tgt_ssl_cas_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_capaths[roop_count] = tmp_tgt_ssl_capaths_char;
-    memcpy(tmp_tgt_ssl_capaths_char,
-      share_alter->tmp_tgt_ssl_capaths[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_capaths_lengths[roop_count]);
-    tmp_tgt_ssl_capaths_char +=
-      share_alter->tmp_tgt_ssl_capaths_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_certs[roop_count] = tmp_tgt_ssl_certs_char;
-    memcpy(tmp_tgt_ssl_certs_char, share_alter->tmp_tgt_ssl_certs[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_certs_lengths[roop_count]);
-    tmp_tgt_ssl_certs_char +=
-      share_alter->tmp_tgt_ssl_certs_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_ciphers[roop_count] = tmp_tgt_ssl_ciphers_char;
-    memcpy(tmp_tgt_ssl_ciphers_char,
-      share_alter->tmp_tgt_ssl_ciphers[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_ciphers_lengths[roop_count]);
-    tmp_tgt_ssl_ciphers_char +=
-      share_alter->tmp_tgt_ssl_ciphers_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_keys[roop_count] = tmp_tgt_ssl_keys_char;
-    memcpy(tmp_tgt_ssl_keys_char, share_alter->tmp_tgt_ssl_keys[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_keys_lengths[roop_count]);
-    tmp_tgt_ssl_keys_char +=
-      share_alter->tmp_tgt_ssl_keys_lengths[roop_count] + 1;
-
-    tmp_tgt_default_files[roop_count] = tmp_tgt_default_files_char;
-    memcpy(tmp_tgt_default_files_char,
-      share_alter->tmp_tgt_default_files[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_default_files_lengths[roop_count]);
-    tmp_tgt_default_files_char +=
-      share_alter->tmp_tgt_default_files_lengths[roop_count] + 1;
-
-    tmp_tgt_default_groups[roop_count] = tmp_tgt_default_groups_char;
-    memcpy(tmp_tgt_default_groups_char,
-      share_alter->tmp_tgt_default_groups[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_default_groups_lengths[roop_count]);
-    tmp_tgt_default_groups_char +=
-      share_alter->tmp_tgt_default_groups_lengths[roop_count] + 1;
+    if ((len=
+             sizeof(char) * share_alter->tmp_server_names_lengths[roop_count]))
+    {
+      tmp_server_names[roop_count]= tmp_server_names_char;
+      memcpy(tmp_server_names_char, share_alter->tmp_server_names[roop_count],
+             len);
+      tmp_server_names_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_table_names_lengths[roop_count]))
+    {
+      tmp_tgt_table_names[roop_count]= tmp_tgt_table_names_char;
+      memcpy(tmp_tgt_table_names_char,
+             share_alter->tmp_tgt_table_names[roop_count], len);
+      tmp_tgt_table_names_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_dbs_lengths[roop_count]))
+    {
+      tmp_tgt_dbs[roop_count]= tmp_tgt_dbs_char;
+      memcpy(tmp_tgt_dbs_char, share_alter->tmp_tgt_dbs[roop_count], len);
+      tmp_tgt_dbs_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_hosts_lengths[roop_count]))
+    {
+      tmp_tgt_hosts[roop_count]= tmp_tgt_hosts_char;
+      memcpy(tmp_tgt_hosts_char, share_alter->tmp_tgt_hosts[roop_count], len);
+      tmp_tgt_hosts_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_usernames_lengths[roop_count]))
+    {
+      tmp_tgt_usernames[roop_count]= tmp_tgt_usernames_char;
+      memcpy(tmp_tgt_usernames_char,
+             share_alter->tmp_tgt_usernames[roop_count], len);
+      tmp_tgt_usernames_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_passwords_lengths[roop_count]))
+    {
+      tmp_tgt_passwords[roop_count]= tmp_tgt_passwords_char;
+      memcpy(tmp_tgt_passwords_char,
+             share_alter->tmp_tgt_passwords[roop_count], len);
+      tmp_tgt_passwords_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_sockets_lengths[roop_count]))
+    {
+      tmp_tgt_sockets[roop_count]= tmp_tgt_sockets_char;
+      memcpy(tmp_tgt_sockets_char, share_alter->tmp_tgt_sockets[roop_count],
+             len);
+      tmp_tgt_sockets_char+= len + 1;
+    }
+
+    if ((len=
+             sizeof(char) * share_alter->tmp_tgt_wrappers_lengths[roop_count]))
+    {
+      tmp_tgt_wrappers[roop_count]= tmp_tgt_wrappers_char;
+      memcpy(tmp_tgt_wrappers_char, share_alter->tmp_tgt_wrappers[roop_count],
+             len);
+      tmp_tgt_wrappers_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_ssl_cas_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_cas[roop_count]= tmp_tgt_ssl_cas_char;
+      memcpy(tmp_tgt_ssl_cas_char, share_alter->tmp_tgt_ssl_cas[roop_count],
+             len);
+      tmp_tgt_ssl_cas_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_ssl_capaths_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_capaths[roop_count]= tmp_tgt_ssl_capaths_char;
+      memcpy(tmp_tgt_ssl_capaths_char,
+             share_alter->tmp_tgt_ssl_capaths[roop_count], len);
+      tmp_tgt_ssl_capaths_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_ssl_certs_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_certs[roop_count]= tmp_tgt_ssl_certs_char;
+      memcpy(tmp_tgt_ssl_certs_char,
+             share_alter->tmp_tgt_ssl_certs[roop_count], len);
+      tmp_tgt_ssl_certs_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_ssl_ciphers_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_ciphers[roop_count]= tmp_tgt_ssl_ciphers_char;
+      memcpy(tmp_tgt_ssl_ciphers_char,
+             share_alter->tmp_tgt_ssl_ciphers[roop_count], len);
+      tmp_tgt_ssl_ciphers_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_ssl_keys_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_keys[roop_count]= tmp_tgt_ssl_keys_char;
+      memcpy(tmp_tgt_ssl_keys_char, share_alter->tmp_tgt_ssl_keys[roop_count],
+             len);
+      tmp_tgt_ssl_keys_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_default_files_lengths[roop_count]))
+    {
+      tmp_tgt_default_files[roop_count]= tmp_tgt_default_files_char;
+      memcpy(tmp_tgt_default_files_char,
+             share_alter->tmp_tgt_default_files[roop_count], len);
+      tmp_tgt_default_files_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_default_groups_lengths[roop_count]))
+    {
+      tmp_tgt_default_groups[roop_count]= tmp_tgt_default_groups_char;
+      memcpy(tmp_tgt_default_groups_char,
+             share_alter->tmp_tgt_default_groups[roop_count], len);
+      tmp_tgt_default_groups_char+= len + 1;
+    }
 
     tmp_tgt_dsns[roop_count] = tmp_tgt_dsns_char;
     memcpy(tmp_tgt_dsns_char, share_alter->tmp_tgt_dsns[roop_count],
@@ -741,14 +774,13 @@ int spider_create_trx_alter_table(
     tmp_tgt_drivers_char +=
       share_alter->tmp_tgt_drivers_lengths[roop_count] + 1;
 
-    if (share_alter->tmp_static_link_ids[roop_count])
+    if ((len= sizeof(char) *
+              share_alter->tmp_static_link_ids_lengths[roop_count]))
     {
       tmp_static_link_ids[roop_count] = tmp_static_link_ids_char;
       memcpy(tmp_static_link_ids_char,
-        share_alter->tmp_static_link_ids[roop_count],
-        sizeof(char) * share_alter->tmp_static_link_ids_lengths[roop_count]);
-      tmp_static_link_ids_char +=
-        share_alter->tmp_static_link_ids_lengths[roop_count] + 1;
+             share_alter->tmp_static_link_ids[roop_count], len);
+      tmp_static_link_ids_char += len + 1;
     }
   }