diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2007-05-17 12:48:10 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2007-05-17 12:48:10 +0500 |
| commit | 28d896ba044f9ce7fa2b35194b2bede1c98e7ce4 (patch) | |
| tree | 715d9edebe2e4291e50b13c838d2a4f9ce35745e /include | |
| parent | de0e4e0a2ba46a300b14b7b3e8b362ae3abac325 (diff) | |
| parent | 6e09887f5d4ef9c09c17af8dc4912201cc153b2b (diff) | |
| download | mariadb-git-28d896ba044f9ce7fa2b35194b2bede1c98e7ce4.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
include/my_sys.h:
Manual merge.
Diffstat (limited to 'include')
| -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 615a074e814..7df2718c7b1 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*/ |