summaryrefslogtreecommitdiff
path: root/mysys/my_fstream.c
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2009-03-23 05:21:45 +0100
committerTatiana A. Nurnberg <azundris@mysql.com>2009-03-23 05:21:45 +0100
commitaeb9747a95dd77c983d58f553637812c99507753 (patch)
treef5252fb21d5ea7c6e6f19beba5ee34903fc4ee47 /mysys/my_fstream.c
parent4093dcfb03e3f39bdfc7c65bea866a070bf3d11d (diff)
parentde750af17dee6b2e7cbcb77b5fa03cd81560d9a2 (diff)
downloadmariadb-git-aeb9747a95dd77c983d58f553637812c99507753.tar.gz
auto-merge
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;
}