diff options
| author | unknown <sanja@askmonty.org> | 2011-09-02 15:10:10 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2011-09-02 15:10:10 +0300 |
| commit | b152c4c71dff8b2142e220850d9329fe63f4cfbd (patch) | |
| tree | 585b0d57da5c535a64dc5393a268e2d4c81c2066 /include | |
| parent | ea8aa329099ee28ec6f1266d8d01a6fc664259cf (diff) | |
| parent | 37a8497d494ea256ff4b13a89e62150e06a17dae (diff) | |
| download | mariadb-git-b152c4c71dff8b2142e220850d9329fe63f4cfbd.tar.gz | |
Merge 5.2->5.3
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 553389fc3be..230991002f4 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -49,7 +49,6 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_WME 16 /* Write message on error */ #define MY_WAIT_IF_FULL 32 /* Wait and try again if disk full error */ #define MY_IGNORE_BADFD 32 /* my_sync: ignore 'bad descriptor' errors */ -#define MY_SYNC_DIR 1024 /* my_create/delete/rename: sync directory */ #define MY_RAID 64 /* Support for RAID */ #define MY_FULL_IO 512 /* For my_read - loop intil I/O is complete */ #define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */ @@ -70,6 +69,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_DONT_OVERWRITE_FILE 2048 /* my_copy: Don't overwrite file */ #define MY_THREADSAFE 2048 /* my_seek(): lock fd mutex */ #define MY_SYNC 4096 /* my_copy(): sync dst file */ +#define MY_SYNC_DIR 32768 /* my_create/delete/rename: sync directory */ #define MY_CHECK_ERROR 1 /* Params to my_end; Check open-close */ #define MY_GIVE_INFO 2 /* Give time info about process*/ @@ -255,7 +255,7 @@ extern ulong my_file_total_opened; extern ulong my_sync_count; extern uint mysys_usage_id; extern my_bool my_init_done; - +extern myf my_global_flags; /* Set to MY_WME for more error messages */ /* Point to current my_message() */ extern void (*my_sigtstp_cleanup)(void), /* Executed before jump to shell */ |