Merge naruto.:C:/cpp/bug20789/my50-bug20789

into  naruto.:C:/cpp/bug20789/my51-bug20789


storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisammrg/myrg_locking.c:
  Auto merged

storage/myisam/mi_locking.c

@@ -237,6 +237,21 @@ int mi_lock_database(MI_INFO *info, int lock_type)
       break;				/* Impossible */
     }
   }
+#ifdef __WIN__
+  else
+  {
+    /*
+       Check for bad file descriptors if this table is part
+       of a merge union. Failing to capture this may cause
+       a crash on windows if the table is renamed and 
+       later on referenced by the merge table.
+     */
+    if( info->owned_by_merge && (info->s)->kfile < 0 )
+    {
+      error = HA_ERR_NO_SUCH_TABLE;
+    }
+  }
+#endif
   pthread_mutex_unlock(&share->intern_lock);
 #if defined(FULL_LOG) || defined(_lint)
   lock_type|=(int) (flag << 8);		/* Set bit to set if real lock */

storage/myisam/myisamdef.h

@@ -291,6 +291,9 @@ struct st_myisam_info {
   my_bool page_changed;		/* If info->buff can't be used for rnext */
   my_bool buff_used;		/* If info->buff has to be reread for rnext */
   my_bool once_flags;           /* For MYISAMMRG */
+#ifdef __WIN__
+  my_bool owned_by_merge;                       /* This MyISAM table is part of a merge union */
+#endif
 #ifdef THREAD
   THR_LOCK_DATA lock;
 #endif

storage/myisammrg/myrg_locking.c

@@ -26,8 +26,19 @@ int myrg_lock_database(MYRG_INFO *info, int lock_type)
   MYRG_TABLE *file;
 
   error=0;
-  for (file=info->open_tables ; file != info->end_table ; file++)
+  for (file=info->open_tables ; file != info->end_table ; file++) 
+  {
+#ifdef __WIN__
+    /*
+      Make sure this table is marked as owned by a merge table.
+      The semaphore is never released as long as table remains
+      in memory. This should be refactored into a more generic
+      approach (observer pattern)
+     */
+    (file->table)->owned_by_merge = TRUE;
+#endif
     if ((new_error=mi_lock_database(file->table,lock_type)))
       error=new_error;
+  }
   return(error);
 }