summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2010-12-06 22:34:50 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2010-12-06 22:34:50 +0100
commit60722bca7b2bf6f4d48201824b459d0505e30167 (patch)
tree6ac1499f53871cdd45ee7f9584dc574e0c57fb64
parent6ad448115bd829360145c865b659dfea65b12907 (diff)
downloadmariadb-git-60722bca7b2bf6f4d48201824b459d0505e30167.tar.gz
Fix LP Bug#686184 - merge_debug test fails.
The reason for failure is that DBUG_EXECUTE_IF in mi_open() only worked for Unix-formatted file names, due to strstr(name, "/crashed") The fix change strstr() above to strstr(name, "crashed"), to it can work with Windows file names as well.
-rw-r--r--storage/myisam/mi_open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c
index 9fc82846e91..9d69f8622e8 100644
--- a/storage/myisam/mi_open.c
+++ b/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;