diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-07 13:21:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-07 13:21:18 +0200 |
| commit | 786bc312b85e58857cb26a24ab6e997ba0fdfc32 (patch) | |
| tree | bc737ff232007a3dd29fceed4bea2e1aefcc77f4 /storage/innobase/row/row0merge.cc | |
| parent | 520c76bfb46cdba3c97e737c2c202319cf3c15c5 (diff) | |
| download | mariadb-git-786bc312b85e58857cb26a24ab6e997ba0fdfc32.tar.gz | |
Cleanup: Replace mysql_cond_t with pthread_cond_t
Let us avoid the memory overhead and the dead duplicated code
for each use of never-instrumented condition variables in InnoDB.
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 33990f619c6..e93f64ecf1d 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -1697,7 +1697,7 @@ row_merge_read_clustered_index( doc_id_t doc_id = 0; doc_id_t max_doc_id = 0; ibool add_doc_id = FALSE; - mysql_cond_t* fts_parallel_sort_cond = nullptr; + pthread_cond_t* fts_parallel_sort_cond = nullptr; index_tuple_info_t** sp_tuples = NULL; mem_heap_t* sp_heap = NULL; ulint num_spatial = 0; @@ -2785,8 +2785,8 @@ wait_again: timespec abstime; set_timespec(abstime, 1); mysql_mutex_lock(&psort_info[0].mutex); - mysql_cond_timedwait(fts_parallel_sort_cond, - &psort_info[0].mutex, &abstime); + my_cond_timedwait(fts_parallel_sort_cond, + &psort_info[0].mutex.m_mutex, &abstime); mysql_mutex_unlock(&psort_info[0].mutex); for (ulint i = 0; i < fts_sort_pll_degree; i++) { |