bk commit into 5.0 tree (svoj:1.2466)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-17 12:48:10+05:00, svoj@stripped +1 -0
  Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines
  into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
  MERGE: 1.1616.3023.8

  include/my_sys.h@stripped, 2007-05-17 12:48:09+05:00, svoj@stripped +1 -1
    Manual merge.
    MERGE: 1.116.5.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	june.mysql.com
# Root:	/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines/RESYNC

--- 1.196/include/my_sys.h	2007-04-24 16:59:42 +05:00
+++ 1.197/include/my_sys.h	2007-05-17 12:48:09 +05:00
@@ -66,8 +66,8 @@ extern int NEAR my_errno;		/* Last error
 #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*/