summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorInaam Rana <inaam.rana@oracle.com>2012-04-23 06:39:16 -0400
committerInaam Rana <inaam.rana@oracle.com>2012-04-23 06:39:16 -0400
commit2415d955c8fff4a2001f4d1774a75f156b787e7c (patch)
tree7cdc3cb57dd3e750bbb8babadd6df6b6953af568 /storage
parentd8ac252f0e3778a5fddaeeefaa1dd48192c8d287 (diff)
downloadmariadb-git-2415d955c8fff4a2001f4d1774a75f156b787e7c.tar.gz
Bug#12677594 - 61575: INNODB: WARNING: IO_SETUP() FAILED WITH EAGAIN.
rb://1033 approved by: Marko Makela Check return value from os_aio_init() and refuse to start if it fails.
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/srv/srv0start.c16
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);