Comparing test results under a broken spiderbb-11.0-mdev-22979-bootstrap-test-demo

- mdev_22979: pass with failed post-test check
- mdev_22979_2: pass
- mdev_22979_bootstrap: ERROR: 12524  Can't open system table mysql.spider_table_sts

9 files changed, 16 insertions, 22 deletions

diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.opt b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.opt
new file mode 100644
index 00000000000..ef47bac21ce
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.opt
@@ -0,0 +1,2 @@
+--plugin-load-add=ha_spider
+--init-file=$MYSQL_TEST_DIR/../storage/spider/mysql-test/spider/bugfix/t/mdev_22979.sql
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.sql b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.sql
new file mode 100644
index 00000000000..81443e258e2
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.sql
@@ -0,0 +1 @@
+drop table if exists foo.bar;
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.test
new file mode 100644
index 00000000000..db58516f027
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979.test
@@ -0,0 +1 @@
+--echo MDEV-22979 with --plugin-load-add in opt
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.opt b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.opt
new file mode 100644
index 00000000000..64cb7228cac
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.opt
@@ -0,0 +1 @@
+--init-file=$MYSQL_TEST_DIR/../storage/spider/mysql-test/spider/bugfix/t/mdev_22979.sql
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.sql b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.sql
new file mode 100644
index 00000000000..96e96385356
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.sql
@@ -0,0 +1,2 @@
+install soname ha_spider;
+drop table if exists foo.bar;
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.test
new file mode 100644
index 00000000000..b76604cbefd
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_2.test
@@ -0,0 +1 @@
+--echo MDEV-22979 with install soname ha_spider in sql
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_bootstrap.sql b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_bootstrap.sql
new file mode 100644
index 00000000000..81443e258e2
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_bootstrap.sql
@@ -0,0 +1 @@
+drop table if exists foo.bar;
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_bootstrap.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_bootstrap.test
new file mode 100644
index 00000000000..cbfc3b450ae
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_22979_bootstrap.test
@@ -0,0 +1,7 @@
+--echo MDEV-22979 with --bootstrap
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+let $PLUGIN_DIR=`select @@plugin_dir`;
+--source include/kill_mysqld.inc
+--exec $MYSQLD_CMD --datadir=$MYSQLD_DATADIR --bootstrap --plugin-dir=$PLUGIN_DIR --plugin-load-add=ha_spider < $MYSQL_TEST_DIR/../storage/spider/mysql-test/spider/bugfix/t/mdev_22979_bootstrap.sql
+--source include/start_mysqld.inc
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
index 82a6ac41674..ab77b87bd33 100644
--- a/storage/spider/spd_table.cc
+++ b/storage/spider/spd_table.cc
@@ -5912,28 +5912,6 @@ handler* spider_create_handler(
   MEM_ROOT *mem_root
 ) {
   DBUG_ENTER("spider_create_handler");
-  SPIDER_THREAD *thread = &spider_table_sts_threads[0];
-  if (unlikely(thread->init_command))
-  {
-    THD *thd = current_thd;
-    pthread_cond_t *cond = thd->mysys_var->current_cond;
-    pthread_mutex_t *mutex = thd->mysys_var->current_mutex;
-    /* wait for finishing init_command */
-    pthread_mutex_lock(&thread->mutex);
-    if (unlikely(thread->init_command))
-    {
-      thd->mysys_var->current_cond = &thread->sync_cond;
-      thd->mysys_var->current_mutex = &thread->mutex;
-      pthread_cond_wait(&thread->sync_cond, &thread->mutex);
-    }
-    pthread_mutex_unlock(&thread->mutex);
-    thd->mysys_var->current_cond = cond;
-    thd->mysys_var->current_mutex = mutex;
-    if (thd->killed)
-    {
-      DBUG_RETURN(NULL);
-    }
-  }
   DBUG_RETURN(new (mem_root) ha_spider(hton, table));
 }