summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvoj@june.mysql.com <>2007-05-17 12:50:58 +0500
committersvoj@june.mysql.com <>2007-05-17 12:50:58 +0500
commit7b4907e450bebe4123a7f5c5cb953bdbbdb36358 (patch)
treefa8d4d1ac25dcd2ac9b7a3d87a6b016a38516fb9
parent820651cd533fbe1bc322370e8abaa8d5db903bfa (diff)
parentcc9d6534e8040fbfdf1d38715ba3516c2d648388 (diff)
downloadmariadb-git-7b4907e450bebe4123a7f5c5cb953bdbbdb36358.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
-rw-r--r--include/my_sys.h2
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*/