At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ ------------------------------------------------------------ revno: 2744 revision-id: psergey@askmonty.org-20090916184547-z63saem4y90zd0u8 parent: psergey@askmonty.org-20090916182518-spnq86qey2xnv33l parent: igor@askmonty.org-20090916174301-lzzh1r0khn3dxwvp committer: Sergey Petrunya <psergey@askmonty.org> branch nick: mysql-5.1-maria-contd3 timestamp: Wed 2009-09-16 22:45:47 +0400 message: Merge modified: storage/xtradb/srv/srv0start.c srv0start.c-20081201061010-zymrrwrczns2vrex-348 ------------------------------------------------------------ revno: 2742.1.1 revision-id: igor@askmonty.org-20090916174301-lzzh1r0khn3dxwvp parent: knielsen@knielsen-hq.org-20090916120716-ssmx93bg4znld9l8 committer: Igor Babaev <igor@askmonty.org> branch nick: maria-5.1-merge timestamp: Wed 2009-09-16 10:43:01 -0700 message: Fix of bug #417751 by Yasufumi Kinoshita. modified: storage/xtradb/srv/srv0start.c srv0start.c-20081201061010-zymrrwrczns2vrex-348 === modified file 'storage/xtradb/srv/srv0start.c' --- a/storage/xtradb/srv/srv0start.c 2009-09-03 13:20:22 +0000 +++ b/storage/xtradb/srv/srv0start.c 2009-09-16 17:43:01 +0000 @@ -1119,8 +1119,14 @@ os_aio_use_native_aio = FALSE; } else { - /* On Win 2000 and XP use async i/o */ - os_aio_use_native_aio = TRUE; + /* On Win 2000 and XP currently native async i/o + is not used for xtradb by default */ + //os_aio_use_native_aio = TRUE; + os_aio_use_native_aio = FALSE; + fprintf(stderr, + "InnoDB: Windows native async i/o is disabled as default.\n" + "InnoDB: It is not applicable for the current" + " multi io threads implementation.\n"); } #endif if (srv_file_flush_method_str == NULL) { @@ -1156,6 +1162,12 @@ } else if (0 == ut_strcmp(srv_file_flush_method_str, "async_unbuffered")) { srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED; + os_aio_use_native_aio = TRUE; + srv_n_read_io_threads = srv_n_write_io_threads = 1; + fprintf(stderr, + "InnoDB: 'async_unbuffered' was detected as innodb_flush_method.\n" + "InnoDB: Windows native async i/o is enabled.\n" + "InnoDB: And io threads are restricted.\n"); #endif } else { fprintf(stderr,