summaryrefslogtreecommitdiff
path: root/innobase/srv
diff options
context:
space:
mode:
authorunknown <heikki@donna.mysql.fi>2001-05-20 20:24:02 +0300
committerunknown <heikki@donna.mysql.fi>2001-05-20 20:24:02 +0300
commit23e19c904763e9456482f882ebefc10c59f433dc (patch)
tree42ebe5c140bed37ad7a6c605cb9bc1d27b6bf0d4 /innobase/srv
parent55cbf7f9587eae2048c26b6f38144af1955ea6da (diff)
downloadmariadb-git-23e19c904763e9456482f882ebefc10c59f433dc.tar.gz
os0file.h InnoDB should now run with the same binary on Win95 and NT: checks OS version
srv0start.c InnoDB should now run with the same binary on Win95 and NT: checks OS version innobase/srv/srv0start.c: InnoDB should now run with the same binary on Win95 and NT: checks OS version innobase/include/os0file.h: InnoDB should now run with the same binary on Win95 and NT: checks OS version
Diffstat (limited to 'innobase/srv')
-rw-r--r--innobase/srv/srv0start.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c
index 6d0d0f45bd2..3136846c450 100644
--- a/innobase/srv/srv0start.c
+++ b/innobase/srv/srv0start.c
@@ -549,11 +549,19 @@ innobase_start_or_create_for_mysql(void)
srv_n_file_io_threads = 4;
#endif
-#ifdef WIN_ASYNC_IO
- /* On NT always use aio */
- os_aio_use_native_aio = TRUE;
-#endif
+#ifdef __WIN__
+ if (os_get_os_version() == OS_WIN95
+ || os_get_os_version() == OS_WIN31) {
+ /* On Win 95, 98, ME, and Win32 subsystem for Windows 3.1 use
+ simulated aio */
+ os_aio_use_native_aio = FALSE;
+ srv_n_file_io_threads = 4;
+ } else {
+ /* On NT and Win 2000 always use aio */
+ os_aio_use_native_aio = TRUE;
+ }
+#endif
if (!os_aio_use_native_aio) {
os_aio_init(4 * SRV_N_PENDING_IOS_PER_THREAD
* srv_n_file_io_threads,