Merge with 5.2

3 files changed, 6 insertions, 6 deletions

diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 8add0f9f4cb..ef5d53710d2 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -178,11 +178,9 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize,
     if ((pos == (my_off_t) -1) && (my_errno == ESPIPE))
     {
       /*
-         This kind of object doesn't support seek() or tell(). Don't set a
-         flag that will make us again try to seek() later and fail.
-      */
-      info->seek_not_done= 0;
-      /*
+        This kind of object doesn't support seek() or tell(). Don't set a
+        seek_not_done that will make us again try to seek() later and fail.
+
         Additionally, if we're supposed to start somewhere other than the
         the beginning of whatever this file is, then somebody made a bad
         assumption.
diff --git a/mysys/my_static.c b/mysys/my_static.c
index c33a12c2ca0..a117bed1496 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -32,7 +32,8 @@ char		NEAR curr_dir[FN_REFLEN]= {0},
 ulong		my_stream_opened=0,my_file_opened=0, my_tmp_file_created=0;
 ulong           my_file_total_opened= 0;
 int		NEAR my_umask=0664, NEAR my_umask_dir=0777;
-myf             my_global_flags;
+myf             my_global_flags= 0;
+my_bool         my_assert_on_error= 0;
 #ifndef THREAD
 int		NEAR my_errno=0;
 #endif
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c
index 9421a3b2d98..d284badfef4 100644
--- a/mysys/thr_mutex.c
+++ b/mysys/thr_mutex.c
@@ -836,6 +836,7 @@ static void print_deadlock_warning(safe_mutex_t *new_mutex,
                         mutex_root->file, mutex_root->line));
   }
   fflush(stderr);
+  DBUG_ASSERT(my_assert_on_error == 0);
   DBUG_VOID_RETURN;
 }