diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-06-21 07:36:18 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-06-21 07:36:18 +0300 |
| commit | 2fb07495ed6aded3a3c9bdbd9456bbe692362bc2 (patch) | |
| tree | 767c26a535c75a55034463ff090808d95891c741 /innobase/fil | |
| parent | c2e9730818d9b4a3aa2c237085d3cd41e3001414 (diff) | |
| parent | 3236060592757ec84b4abcd9e617009dd68555e1 (diff) | |
| download | mariadb-git-2fb07495ed6aded3a3c9bdbd9456bbe692362bc2.tar.gz | |
Merge hundin.mysql.fi:/home/marko/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'innobase/fil')
| -rw-r--r-- | innobase/fil/fil0fil.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index 8600f583dbd..299b55f3d2b 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -99,7 +99,6 @@ ulint fil_n_pending_tablespace_flushes = 0; fil_addr_t fil_addr_null = {FIL_NULL, 0}; /* File node of a tablespace or the log data space */ -typedef struct fil_node_struct fil_node_t; struct fil_node_struct { fil_space_t* space; /* backpointer to the space where this node belongs */ @@ -4046,7 +4045,7 @@ fil_aio_wait( } else { srv_set_io_thread_op_info(segment, "simulated aio handle"); - ret = os_aio_simulated_handle(segment, (void**) &fil_node, + ret = os_aio_simulated_handle(segment, &fil_node, &message, &type); } |