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/fil | |
| 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/fil')
| -rw-r--r-- | innobase/fil/fil0fil.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index 1abb1b926f2..44f1777bb33 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -1321,7 +1321,7 @@ fil_aio_wait( ut_ad(fil_validate()); if (os_aio_use_native_aio) { - srv_io_thread_op_info[segment] = (char *) "native aio handle"; + srv_set_io_thread_op_info(segment, "native aio handle"); #ifdef WIN_ASYNC_IO ret = os_aio_windows_handle(segment, 0, &fil_node, &message, &type); @@ -1332,7 +1332,7 @@ fil_aio_wait( ut_error; #endif } else { - srv_io_thread_op_info[segment] =(char *)"simulated aio handle"; + srv_set_io_thread_op_info(segment, "simulated aio handle"); ret = os_aio_simulated_handle(segment, (void**) &fil_node, &message, &type); @@ -1340,7 +1340,7 @@ fil_aio_wait( ut_a(ret); - srv_io_thread_op_info[segment] = (char *) "complete io for fil node"; + srv_set_io_thread_op_info(segment, "complete io for fil node"); mutex_enter(&(system->mutex)); @@ -1353,11 +1353,10 @@ fil_aio_wait( /* Do the i/o handling */ if (buf_pool_is_block(message)) { - srv_io_thread_op_info[segment] = - (char *) "complete io for buf page"; + srv_set_io_thread_op_info(segment, "complete io for buf page"); buf_page_io_complete(message); } else { - srv_io_thread_op_info[segment] =(char *) "complete io for log"; + srv_set_io_thread_op_info(segment, "complete io for log"); log_io_complete(message); } } |