diff options
| author | Kent Boortz <kent.boortz@oracle.com> | 2012-04-23 13:03:42 +0200 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@oracle.com> | 2012-04-23 13:03:42 +0200 |
| commit | 2b877ca2bb41962171028291aae54e89b4457871 (patch) | |
| tree | d65d81c91245d83e0b5dae4d380461445a51a6e8 | |
| parent | 9927a07bc1fd8de3fc936a1615e17db9b885daca (diff) | |
| parent | 57202cbfc5fb9f071176ff11146976bc32124eac (diff) | |
| download | mariadb-git-2b877ca2bb41962171028291aae54e89b4457871.tar.gz | |
Merge
| -rw-r--r-- | storage/innobase/srv/srv0start.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index 343e41fe376..86669a50895 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -1364,10 +1364,18 @@ innobase_start_or_create_for_mysql(void) } # endif /* __WIN__ */ - os_aio_init(io_limit, - srv_n_read_io_threads, - srv_n_write_io_threads, - SRV_MAX_N_PENDING_SYNC_IOS); + if (!os_aio_init(io_limit, + srv_n_read_io_threads, + srv_n_write_io_threads, + SRV_MAX_N_PENDING_SYNC_IOS)) { + + ut_print_timestamp(stderr); + fprintf(stderr, + " InnoDB: Fatal error: cannot initialize AIO" + " sub-system\n"); + + return(DB_ERROR); + } fil_init(srv_file_per_table ? 50000 : 5000, srv_max_n_open_files); |