mysql-5.1 merge

mysys/errors.c:
  revert upstream's fix. use a much simpler one
mysys/my_write.c:
  revert upstream's fix. use a simpler one
sql/item_xmlfunc.cc:
  useless, but ok
sql/mysqld.cc:
  simplify upstream's fix
storage/heap/hp_delete.c:
  remove upstream's fix.
  we'll use a much less expensive approach.

1 files changed, 1 insertions, 1 deletions

diff --git a/mysys/my_write.c b/mysys/my_write.c
index 11708d8f10e..14d16955a0a 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.c
@@ -44,7 +44,7 @@ size_t my_write(int Filedes, const uchar *Buffer, size_t Count, myf MyFlags)
        and the number pf written bytes to -1.
      */
     DBUG_EXECUTE_IF ("simulate_file_write_error",
-                     {
+                     if (!errors) {
                        errno= ENOSPC;
                        writenbytes= (size_t) -1;
                      });