Browse Source

innodb/xtradb: init scrub mutex even in read-only mode

because it's locked for innodb part of SHOW STATUS,
which can happen in read-only mode too.
pull/137/head
Sergei Golubchik 10 years ago
parent
commit
dfb58a3782
  1. 12
      storage/innobase/srv/srv0start.cc
  2. 12
      storage/xtradb/srv/srv0start.cc

12
storage/innobase/srv/srv0start.cc

@ -2983,9 +2983,6 @@ files_checked:
/* Create the thread that will optimize the FTS sub-system. */
fts_optimize_init();
/* Init data for datafile scrub threads */
btr_scrub_init();
/* Create thread(s) that handles key rotation */
fil_crypt_threads_init();
@ -2994,6 +2991,9 @@ files_checked:
os_thread_create(log_scrub_thread, NULL, NULL);
}
/* Init data for datafile scrub threads */
btr_scrub_init();
/* Initialize online defragmentation. */
btr_defragment_init();
@ -3177,11 +3177,11 @@ innobase_shutdown_for_mysql(void)
if (!srv_read_only_mode) {
fil_crypt_threads_cleanup();
/* Cleanup data for datafile scrubbing */
btr_scrub_cleanup();
}
/* Cleanup data for datafile scrubbing */
btr_scrub_cleanup();
#ifdef __WIN__
/* MDEV-361: ha_innodb.dll leaks handles on Windows
MDEV-7403: should not pass recv_writer_thread_handle to

12
storage/xtradb/srv/srv0start.cc

@ -3075,9 +3075,6 @@ files_checked:
/* Create the thread that will optimize the FTS sub-system. */
fts_optimize_init();
/* Init data for datafile scrub threads */
btr_scrub_init();
/* Create thread(s) that handles key rotation */
fil_crypt_threads_init();
@ -3086,6 +3083,9 @@ files_checked:
os_thread_create(log_scrub_thread, NULL, NULL);
}
/* Init data for datafile scrub threads */
btr_scrub_init();
/* Initialize online defragmentation. */
btr_defragment_init();
@ -3269,11 +3269,11 @@ innobase_shutdown_for_mysql(void)
if (!srv_read_only_mode) {
fil_crypt_threads_cleanup();
/* Cleanup data for datafile scrubbing */
btr_scrub_cleanup();
}
/* Cleanup data for datafile scrubbing */
btr_scrub_cleanup();
#ifdef __WIN__
/* MDEV-361: ha_innodb.dll leaks handles on Windows
MDEV-7403: should not pass recv_writer_thread_handle to

Loading…
Cancel
Save