List:Commits« Previous MessageNext Message »
From:Petr Chardin Date:June 29 2006 11:29pm
Subject:bk commit into 5.1 tree (petr:1.2223)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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
  1.2223 06/06/30 03:28:58 petr@stripped +1 -0
  fix test failures

  mysys/my_pread.c
    1.12 06/06/30 03:28:35 petr@stripped +3 -2
    don't set errno without a real error

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/5.1-team

--- 1.11/mysys/my_pread.c	2006-06-29 21:43:34 +04:00
+++ 1.12/mysys/my_pread.c	2006-06-30 03:28:35 +04:00
@@ -66,8 +66,9 @@
 
     pthread_mutex_unlock(&my_file_info[Filedes].mutex);
 #else
-    error=((readbytes = (uint) pread(Filedes, Buffer, Count, offset)) != Count);
-    my_errno= errno;
+    if ((error= ((readbytes =
+                  (uint) pread(Filedes, Buffer, Count, offset)) != Count)))
+      my_errno= errno;
 #endif
     if (error || readbytes != Count)
     {
Thread
bk commit into 5.1 tree (petr:1.2223)Petr Chardin30 Jun