diff options
author | Yuchen Pei <yuchen.pei@mariadb.com> | 2023-04-26 12:40:47 +1000 |
---|---|---|
committer | Yuchen Pei <yuchen.pei@mariadb.com> | 2023-04-26 12:40:47 +1000 |
commit | 9d11e02f865d2f70ec2b9e6e8c7ffa98445f9bf4 (patch) | |
tree | 7297d7e17cf5d92535f3ef6b02a6957bec45b3ee | |
parent | 3799493d3fddaa4962a30f7a34e6cb9341808461 (diff) | |
download | mariadb-git-9d11e02f865d2f70ec2b9e6e8c7ffa98445f9bf4.tar.gz |
MDEV-22979 [do not push] remove wait in spider_create_handler()bb-11.0-mdev-22979-create-handler-no-wait
This will fail mdev_22979_bootstrap due to race condition.
-rw-r--r-- | storage/spider/spd_table.cc | 22 |
1 files changed, 0 insertions, 22 deletions
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)); } |