merge LP Bug#686184

storage/myisam/mi_close.c

@@ -61,7 +61,7 @@ int mi_close(register MI_INFO *info)
   if (flag)
   {
     DBUG_EXECUTE_IF("crash_before_flush_keys",
-                    if (share->kfile >= 0) abort(););
+                    if (share->kfile >= 0) DBUG_ABORT(););
     if (share->kfile >= 0 &&
 	flush_key_blocks(share->key_cache, share->kfile,
                          &share->dirty_part_map,

storage/myisam/mi_open.c

@@ -119,7 +119,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
                                                  dflt_key_cache);
 
     DBUG_EXECUTE_IF("myisam_pretend_crashed_table_on_open",
-                    if (strstr(name, "/crashed"))
+                    if (strstr(name, "crashed"))
                     {
                       my_errno= HA_ERR_CRASHED;
                       goto err;