diff --git a/include/config-win.h b/include/config-win.h
index edfb4ecc5c7..528bc8a8cdd 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -325,6 +325,11 @@ inline double ulonglong2double(ulonglong value)
 #define HAVE_SETFILEPOINTER
 #define HAVE_VIO_READ_BUFF
 
+#ifndef __NT__
+#undef FILE_SHARE_DELETE
+#define FILE_SHARE_DELETE 0     /* Not implemented on Win 98/ME */
+#endif
+
 #ifdef NOT_USED
 #define HAVE_SNPRINTF		/* Gave link error */
 #define _snprintf snprintf
diff --git a/mysql-test/r/ndb_multi.result b/mysql-test/r/ndb_multi.result
index 066874a4969..8409ccab1ea 100644
--- a/mysql-test/r/ndb_multi.result
+++ b/mysql-test/r/ndb_multi.result
@@ -35,6 +35,7 @@ Level	Code	Message
 Error	1296	Got error 241 'Invalid schema object version' from NDB
 Error	1412	Table definition has changed, please retry transaction
 Error	1105	Unknown error
+flush table t1;
 select * from t1;
 a
 2
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index 450e728090e..de9f6f16b2a 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -50,7 +50,7 @@ select (@id := id) - id from t2;
 0
 kill @id;
 drop table t2;
-ERROR 08S01: Server shutdown in progress
+Got one of the listed errors
 set global sql_slave_skip_counter=1;
 start slave;
 select count(*) from t1;
diff --git a/mysql-test/t/flush_read_lock_kill.test b/mysql-test/t/flush_read_lock_kill.test
index de2576300dc..19a47b2893a 100644
--- a/mysql-test/t/flush_read_lock_kill.test
+++ b/mysql-test/t/flush_read_lock_kill.test
@@ -42,7 +42,7 @@ connection con1;
 # debug build running without our --debug=make_global..., will be
 # error 0 (no error). The only important thing to test is that on
 # debug builds with our --debug=make_global... we don't hang forever.
---error 0,1053
+--error 0,1053,2013
 reap;
 
 connection con2;
diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test
index 089f7a80550..0d34e698e28 100644
--- a/mysql-test/t/ndb_multi.test
+++ b/mysql-test/t/ndb_multi.test
@@ -41,6 +41,7 @@ connection server1;
 --error 1412
 select * from t1;
 show warnings;
+flush table t1;
 select * from t1;
 
 # Connect to server2 and use the tables from there
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index 3d03823d474..45d621b730f 100644
--- a/mysql-test/t/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -92,7 +92,7 @@ kill @id;
 # We don't drop t3 as this is a temporary table
 drop table t2;
 connection master;
---error 1053
+--error 1053,2013
 reap;
 connection slave;
 # The SQL slave thread should now have stopped because the query was killed on
diff --git a/mysql-test/t/rpl_deadlock.test b/mysql-test/t/rpl_deadlock.test
index 08921caf897..c74ed989ece 100644
--- a/mysql-test/t/rpl_deadlock.test
+++ b/mysql-test/t/rpl_deadlock.test
@@ -58,7 +58,7 @@ while ($1)
 enable_query_log;
 select * from t1 for update;
 start slave;
---sleep 3 # hope that slave is blocked now
+--real_sleep 3 # hope that slave is blocked now
 insert into t2 values(22); # provoke deadlock, slave should be victim
 commit;
 sync_with_master;
@@ -76,7 +76,7 @@ change master to master_log_pos=532; # the BEGIN log event
 begin;
 select * from t2 for update; # hold lock
 start slave;
---sleep 10 # slave should have blocked, and be retrying
+--real_sleep 10 # slave should have blocked, and be retrying
 commit;
 sync_with_master;
 select * from t1; # check that slave succeeded finally
@@ -97,7 +97,7 @@ change master to master_log_pos=532;
 begin;
 select * from t2 for update;
 start slave;
---sleep 10
+--real_sleep 10
 commit;
 sync_with_master;
 select * from t1;
diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test
index cb4137c49e0..339d966dbb3 100644
--- a/mysql-test/t/rpl_error_ignored_table.test
+++ b/mysql-test/t/rpl_error_ignored_table.test
@@ -45,7 +45,7 @@ select (@id := id) - id from t3;
 kill @id;
 drop table t2,t3;
 connection master;
---error 0,1053
+--error 0,1053,2013
 reap;
 connection master1;
 --replace_column 2 # 5 #
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 050a6ea8af8..d6d70431eea 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -3014,7 +3014,6 @@ void ha_ndbcluster::position(const byte *record)
         }      
         *buff++= 0;
       }
-
       size_t len = key_part->length;
       const byte * ptr = record + key_part->offset;
       Field *field = key_part->field;
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 3c91e81c57a..a28324c5e28 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -473,10 +473,12 @@ void THD::awake(THD::killed_state state_to_set)
 
   killed= state_to_set;
   if (state_to_set != THD::KILL_QUERY)
+  {
     thr_alarm_kill(real_id);
 #ifdef SIGNAL_WITH_VIO_CLOSE
-  close_active_vio();
+    close_active_vio();
 #endif    
+  }
   if (mysys_var)
   {
     pthread_mutex_lock(&mysys_var->mutex);