diff options
| author | Michael Widenius <monty@mysql.com> | 2010-08-09 21:00:00 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-08-09 21:00:00 +0300 |
| commit | 06a457229715a6d124fe0381293dce42013aa258 (patch) | |
| tree | ab715cbd05bf4036d58e1944471e6fa1fde05c9a /mysys | |
| parent | 4339204ce5f61b950a0b085c6ac75e4130b2d4e2 (diff) | |
| parent | 7cf5100412e76516304359e7d6a2824bc6a57023 (diff) | |
| download | mariadb-git-06a457229715a6d124fe0381293dce42013aa258.tar.gz | |
Automatic merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_static.c | 1 | ||||
| -rw-r--r-- | mysys/my_sync.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index 0ef5656b76f..08653d03d21 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -119,6 +119,7 @@ ulonglong query_performance_frequency, query_performance_offset; /* How to disable options */ my_bool NEAR my_disable_locking=0; +my_bool NEAR my_disable_sync=0; my_bool NEAR my_disable_async_io=0; my_bool NEAR my_disable_flush_key_blocks=0; my_bool NEAR my_disable_symlinks=0; diff --git a/mysys/my_sync.c b/mysys/my_sync.c index 967a6ae6c78..9f6c55f4fb6 100644 --- a/mysys/my_sync.c +++ b/mysys/my_sync.c @@ -48,6 +48,9 @@ int my_sync(File fd, myf my_flags) DBUG_ENTER("my_sync"); DBUG_PRINT("my",("fd: %d my_flags: %d", fd, my_flags)); + if (my_disable_sync) + DBUG_RETURN(0); + statistic_increment(my_sync_count,&THR_LOCK_open); do { |