diff options
| author | monty@bitch.mysql.fi <> | 2002-06-05 23:14:22 +0300 |
|---|---|---|
| committer | monty@bitch.mysql.fi <> | 2002-06-05 23:14:22 +0300 |
| commit | 268e82a07815389ba648fdf611d32df036a8dfac (patch) | |
| tree | cbbe7a8d707cd615938d182f78c476cce99578da /innobase | |
| parent | e0f60f3527644011adf853d4586383b1f9a5ca7a (diff) | |
| parent | 9263b77e0c48a457cd097892b98fc00cba20dc15 (diff) | |
| download | mariadb-git-268e82a07815389ba648fdf611d32df036a8dfac.tar.gz | |
Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/srv/srv0srv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index f366ce0d160..39f3566eac8 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -1631,6 +1631,7 @@ srv_init(void) for (i = 0; i < OS_THREAD_MAX_N; i++) { slot = srv_table_get_nth_slot(i); slot->in_use = FALSE; + slot->type=0; /* Avoid purify errors */ slot->event = os_event_create(NULL); ut_a(slot->event); } @@ -1899,7 +1900,6 @@ srv_conc_exit_innodb( trx_t* trx) /* in: transaction object associated with the thread */ { - srv_conc_slot_t* slot = NULL; if (srv_thread_concurrency >= 500) { @@ -2514,11 +2514,11 @@ loop: can drop tables lazily after there no longer are SELECT queries to them. */ - srv_main_thread_op_info = "doing background drop tables"; + srv_main_thread_op_info = (char*) "doing background drop tables"; row_drop_tables_for_mysql_in_background(); - srv_main_thread_op_info = ""; + srv_main_thread_op_info = (char*) ""; if (srv_force_recovery >= SRV_FORCE_NO_BACKGROUND) { @@ -2630,19 +2630,19 @@ background_loop: /* In this loop we run background operations when the server is quiet and we also come here about once in 10 seconds */ - srv_main_thread_op_info = "doing background drop tables"; + srv_main_thread_op_info = (char*) "doing background drop tables"; n_tables_to_drop = row_drop_tables_for_mysql_in_background(); - srv_main_thread_op_info = ""; + srv_main_thread_op_info = (char*) ""; - srv_main_thread_op_info = "flushing buffer pool pages"; + srv_main_thread_op_info = (char*) "flushing buffer pool pages"; /* Flush a few oldest pages to make the checkpoint younger */ n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST, 10, ut_dulint_max); - srv_main_thread_op_info = "making checkpoint"; + srv_main_thread_op_info = (char*) "making checkpoint"; /* Make a new checkpoint about once in 10 seconds */ |