summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-12-24 15:19:00 +0200
committermonty@donna.mysql.com <>2000-12-24 15:19:00 +0200
commitb590fa2567f3a4c1f0055618fb4d06e1af7ae85b (patch)
tree899e99579647137316d4fbc999750fb989b1cf2e /mysys
parent11f7fd10f080461e34114869daf853ba714ff03c (diff)
downloadmariadb-git-b590fa2567f3a4c1f0055618fb4d06e1af7ae85b.tar.gz
New benchmark test
Fixed bug in REPLACE with BDB tables Prepare for write lock on read for BDB Inform the handler when we want to use IGNORE / REPLACE New manual pages
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_write.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_write.c b/mysys/my_write.c
index 0ff32094ed7..03cbec4a0d6 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.c
@@ -47,7 +47,8 @@ uint my_write(int Filedes, const byte *Buffer, uint Count, myf MyFlags)
if (my_thread_var->abort)
MyFlags&= ~ MY_WAIT_IF_FULL; /* End if aborted by user */
#endif
- if (my_errno == ENOSPC && (MyFlags & MY_WAIT_IF_FULL))
+ if (my_errno == ENOSPC && (MyFlags & MY_WAIT_IF_FULL) &&
+ (uint) writenbytes != (uint) -1)
{
if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),