5.5 merge

1 files changed, 11 insertions, 5 deletions

diff --git a/mysys/my_write.c b/mysys/my_write.c
index 204e2e1488d..3c94fab2ec7 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.c
@@ -47,11 +47,17 @@ size_t my_write(File Filedes, const uchar *Buffer, size_t Count, myf MyFlags)
 #else
     writtenbytes= write(Filedes, Buffer, Count);
 #endif
-    DBUG_EXECUTE_IF("simulate_file_write_error",
-                    {
-                      errno= ENOSPC;
-                      writtenbytes= (size_t) -1;
-                    });
+
+    /**
+       To simulate the write error set the errno = error code
+       and the number pf written bytes to -1.
+     */
+    DBUG_EXECUTE_IF ("simulate_file_write_error",
+                     if (!errors) {
+                       errno= ENOSPC;
+                       writtenbytes= (size_t) -1;
+                     });
+
     if (writtenbytes == Count)
       break;
     if (writtenbytes != (size_t) -1)