summaryrefslogtreecommitdiff
path: root/mysys/my_fstream.c
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2009-04-14 13:20:13 -0400
committerChad MILLER <chad@mysql.com>2009-04-14 13:20:13 -0400
commit14f923c0286588f9f391a2fda8b9fab5a4e2953c (patch)
tree55596b47965261462217616f8271d0c2b9d79ab0 /mysys/my_fstream.c
parent9d7f61dc698ee6b1dd379cc5820c59b8a9806c2d (diff)
parentbd2db28cdad7e715b9efcee2f440f432a0562e8f (diff)
downloadmariadb-git-14f923c0286588f9f391a2fda8b9fab5a4e2953c.tar.gz
Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.
Diffstat (limited to 'mysys/my_fstream.c')
-rw-r--r--mysys/my_fstream.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mysys/my_fstream.c b/mysys/my_fstream.c
index ea30509ca8c..38b27bce100 100644
--- a/mysys/my_fstream.c
+++ b/mysys/my_fstream.c
@@ -116,10 +116,8 @@ uint my_fwrite(FILE *stream, const byte *Buffer, uint Count, myf MyFlags)
if ((errno == ENOSPC || errno == EDQUOT) &&
(MyFlags & MY_WAIT_IF_FULL))
{
- if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
- my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
- "[stream]",my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
- VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
+ wait_for_free_space("[stream]", errors);
+ errors++;
VOID(my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0)));
continue;
}