diff options
| author | unknown <svoj@june.mysql.com> | 2007-05-17 12:50:58 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-05-17 12:50:58 +0500 |
| commit | 0ea67375efc66950d691ce7bdb5cab8eb0a158d5 (patch) | |
| tree | fa8d4d1ac25dcd2ac9b7a3d87a6b016a38516fb9 | |
| parent | 36b9ba4769d96da2a6206bf4418582a15580b361 (diff) | |
| parent | 28d896ba044f9ce7fa2b35194b2bede1c98e7ce4 (diff) | |
| download | mariadb-git-0ea67375efc66950d691ce7bdb5cab8eb0a158d5.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.1-engines
include/my_sys.h:
Auto merged
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 440ae005cef..d9e16b5f917 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -66,8 +66,8 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_ALLOW_ZERO_PTR 64 /* my_realloc() ; zero ptr -> malloc */ #define MY_FREE_ON_ERROR 128 /* my_realloc() ; Free old ptr on error */ #define MY_HOLD_ON_ERROR 256 /* my_realloc() ; Return old ptr on error */ -#define MY_THREADSAFE 128 /* pread/pwrite: Don't allow interrupts */ #define MY_DONT_OVERWRITE_FILE 1024 /* my_copy: Don't overwrite file */ +#define MY_THREADSAFE 2048 /* my_seek(): lock fd mutex */ #define MY_CHECK_ERROR 1 /* Params to my_end; Check open-close */ #define MY_GIVE_INFO 2 /* Give time info about process*/ |