diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-04-01 16:54:22 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-04-01 16:54:22 +0300 |
| commit | 41aa345dbb41af75815297bbc546a11cf04b2e63 (patch) | |
| tree | 8252343ff9865c289e77cc494d095d7aa748dffd /innobase/srv | |
| parent | 025ddfea288890236d4da04b46b3fff926707de3 (diff) | |
| parent | a9fb96b2cb1ecce7ba433659eacbec6bc974a0af (diff) | |
| download | mariadb-git-41aa345dbb41af75815297bbc546a11cf04b2e63.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
innobase/fil/fil0fil.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
Diffstat (limited to 'innobase/srv')
| -rw-r--r-- | innobase/srv/srv0srv.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index e4eb3a7f556..87e15037fb6 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -285,8 +285,8 @@ ulint srv_test_n_mutexes = ULINT_MAX; /* Array of English strings describing the current state of an i/o handler thread */ -char* srv_io_thread_op_info[SRV_MAX_N_IO_THREADS]; -char* srv_io_thread_function[SRV_MAX_N_IO_THREADS]; +const char* srv_io_thread_op_info[SRV_MAX_N_IO_THREADS]; +const char* srv_io_thread_function[SRV_MAX_N_IO_THREADS]; time_t srv_last_monitor_time; @@ -514,6 +514,20 @@ are indexed by the type of the thread. */ ulint srv_n_threads_active[SRV_MASTER + 1]; ulint srv_n_threads[SRV_MASTER + 1]; +/************************************************************************* +Sets the info describing an i/o thread current state. */ + +void +srv_set_io_thread_op_info( +/*======================*/ + ulint i, /* in: the 'segment' of the i/o thread */ + const char* str) /* in: constant char string describing the + state */ +{ + ut_a(i < SRV_MAX_N_IO_THREADS); + + srv_io_thread_op_info[i] = str; +} /************************************************************************* Accessor function to get pointer to n'th slot in the server thread |