diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
| commit | 567671368723c704d60902b4d0ccff951b414552 (patch) | |
| tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /mysys/my_sync.c | |
| parent | efee0608316e4cc034a3e62d05980eef8530843d (diff) | |
| parent | ceefe7bb50b17b72e88851e3b98642e89a4cddae (diff) | |
| download | mariadb-git-567671368723c704d60902b4d0ccff951b414552.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'mysys/my_sync.c')
| -rw-r--r-- | mysys/my_sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_sync.c b/mysys/my_sync.c index 97540f5eb48..6497ae59159 100644 --- a/mysys/my_sync.c +++ b/mysys/my_sync.c @@ -62,8 +62,8 @@ int my_sync(File fd, myf my_flags) res= fdatasync(fd); #elif defined(HAVE_FSYNC) res= fsync(fd); -#elif defined(__WIN__) - res= _commit(fd); +#elif defined(_WIN32) + res= my_win_fsync(fd); #else #error Cannot find a way to sync a file, durability in danger res= 0; /* No sync (strange OS) */ |