summaryrefslogtreecommitdiff
path: root/mysys/my_write.c
diff options
context:
space:
mode:
authorunknown <tsmith/tim@siva.hindu.god>2006-09-14 23:19:24 -0600
committerunknown <tsmith/tim@siva.hindu.god>2006-09-14 23:19:24 -0600
commitd7a1f97c15fc5adaaf3116b8fb9ee32783498165 (patch)
treedd6fccf50a67ceee15c758d3bd103902956a4058 /mysys/my_write.c
parent89c7db0cb0a67a8c7bd30eb4043ec948554244e9 (diff)
downloadmariadb-git-d7a1f97c15fc5adaaf3116b8fb9ee32783498165.tar.gz
Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event' from master"
- Fix my_read/my_write to handle return values from read/write correctly - Add debugging 'deprecated function' warning to my_lread/my_lwrite - Add debugging 'error, read/write interrupt not handled' warning to my_quick_read/my_quick_write There is no test case associated with these changes. However, this is a conservative change, and no repeatable test case is available. mysys/my_lread.c: Warn about using deprecated function. mysys/my_lwrite.c: Warn about using deprecated function. mysys/my_pread.c: Handle interrupted read() or write() (EINTR) properly mysys/my_quick.c: Warn about interrupted read() or write(), which is not handled by my_quick_read() or my_quick_write(). mysys/my_read.c: Handle interrupted read() (EINTR) properly mysys/my_write.c: Handle interrupted write() (EINTR) properly
Diffstat (limited to 'mysys/my_write.c')
-rw-r--r--mysys/my_write.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/mysys/my_write.c b/mysys/my_write.c
index 1d1a893090a..de762c16a07 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.c
@@ -57,18 +57,24 @@ uint my_write(int Filedes, const byte *Buffer, uint Count, myf MyFlags)
VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
continue;
}
- if (!writenbytes)
+
+ if ((writenbytes == 0 || (int) writenbytes == -1))
{
- /* We may come here on an interrupt or if the file quote is exeeded */
if (my_errno == EINTR)
- continue;
- if (!errors++) /* Retry once */
{
- errno=EFBIG; /* Assume this is the error */
- continue;
+ DBUG_PRINT("debug", ("my_write() was interrupted and returned %d",
+ (int) writenbytes));
+ continue; /* Interrupted */
+ }
+
+ if (!writenbytes && !errors++) /* Retry once */
+ {
+ /* We may come here if the file quota is exeeded */
+ errno=EFBIG; /* Assume this is the error */
+ continue;
}
}
- else if ((uint) writenbytes != (uint) -1)
+ else
continue; /* Retry */
#endif
if (MyFlags & (MY_NABP | MY_FNABP))