diff options
author | He Zhenxing <zhenxing.he@sun.com> | 2009-03-06 17:38:14 +0800 |
---|---|---|
committer | He Zhenxing <zhenxing.he@sun.com> | 2009-03-06 17:38:14 +0800 |
commit | 5229ef4ac8d187760b2ed2c7a8108e03e3185da7 (patch) | |
tree | 2f87ecb15bf2110f5197c10da49c1cf6db1420e1 /mysys/my_fstream.c | |
parent | 583390388916e21b9008fdc3871df9f1304bf8c2 (diff) | |
parent | 37068efd819cbb8f564609ebca46ae47872b3864 (diff) | |
download | mariadb-git-5229ef4ac8d187760b2ed2c7a8108e03e3185da7.tar.gz |
Merge BUG#22082 from 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'mysys/my_fstream.c')
-rw-r--r-- | mysys/my_fstream.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysys/my_fstream.c b/mysys/my_fstream.c index f5fe862937c..f3b5418b906 100644 --- a/mysys/my_fstream.c +++ b/mysys/my_fstream.c @@ -131,10 +131,8 @@ size_t my_fwrite(FILE *stream, const uchar *Buffer, size_t 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; } |