Below is the list of changes that have just been committed into a local
4.1 repository of thek. When thek 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, 2006-11-01 09:24:57+01:00, thek@stripped +1 -0
Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
MERGE: 1.2510.62.1
mysys/my_chsize.c@stripped, 2006-11-01 09:24:55+01:00, thek@stripped +0 -0
Auto merged
MERGE: 1.15.1.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: thek
# Host: kpdesk.mysql.com
# Root: /home/thek/dev/mysql-4.1-maint/RESYNC
--- 1.16/mysys/my_chsize.c 2006-11-01 09:25:00 +01:00
+++ 1.17/mysys/my_chsize.c 2006-11-01 09:25:00 +01:00
@@ -90,7 +90,11 @@ int my_chsize(File fd, my_off_t newlengt
Fill space between requested length and true length with 'filler'
We should never come here on any modern machine
*/
- VOID(my_seek(fd, newlength, MY_SEEK_SET, MYF(MY_WME+MY_FAE)));
+ if (my_seek(fd, newlength, MY_SEEK_SET, MYF(MY_WME+MY_FAE))
+ == MY_FILEPOS_ERROR)
+ {
+ goto err;
+ }
swap_variables(my_off_t, newlength, oldsize);
}
#endif
| Thread |
|---|
| • bk commit into 4.1 tree (thek:1.2612) | kpettersson | 1 Nov |