1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge LP Bug#686184

Browse Source
This commit is contained in:
Vladislav Vaintroub 2010-12-07 00:15:27 +01:00
commit 2de9a7742a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/myisam/mi_close.c
View File

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

2
storage/myisam/mi_open.c
View File

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