diff options
| author | unknown <serg@sergbook.mysql.com> | 2005-01-07 15:02:25 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2005-01-07 15:02:25 +0200 |
| commit | b194c1c1ce61c94c6a35d4825aefb024288b99d3 (patch) | |
| tree | 367721392581d90d303dae4bddcea91c6d5fd6de /mysys | |
| parent | e1073b1f04fc64f3299282b08c3353109469be6e (diff) | |
| parent | 9ad1b390fcf12ec7aa7b9fad157d6e0a61045b40 (diff) | |
| download | mariadb-git-b194c1c1ce61c94c6a35d4825aefb024288b99d3.tar.gz | |
merge
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
manually merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_write.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/my_write.c b/mysys/my_write.c index 2df3a31e774..4e8369480b3 100644 --- a/mysys/my_write.c +++ b/mysys/my_write.c @@ -49,8 +49,7 @@ uint my_write(int Filedes, const byte *Buffer, uint Count, myf MyFlags) MyFlags&= ~ MY_WAIT_IF_FULL; /* End if aborted by user */ #endif if ((my_errno == ENOSPC || my_errno == EDQUOT) && - (MyFlags & MY_WAIT_IF_FULL) && - (uint) writenbytes != (uint) -1) + (MyFlags & MY_WAIT_IF_FULL)) { if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE)) my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH), |