summaryrefslogtreecommitdiff
path: root/myisam/mi_open.c
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-11-21 03:43:34 +0200
committermonty@donna.mysql.com <>2000-11-21 03:43:34 +0200
commitb65dbb61143e7add58481dc4bc184c530a9a5582 (patch)
tree18fdf025bea7d918e304f45384902d822f68f2f6 /myisam/mi_open.c
parentb7d81c037904a6d5d9e4a8602b1c9d5406a23a20 (diff)
downloadmariadb-git-b65dbb61143e7add58481dc4bc184c530a9a5582.tar.gz
Fixed problem with auto-repair of MyISAM tables
Fixed bug in ISAM and MyISAM when updating from multiple-processes
Diffstat (limited to 'myisam/mi_open.c')
-rw-r--r--myisam/mi_open.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index c29a4a843ca..2eab33228dc 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -182,7 +182,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
{
DBUG_PRINT("error",("Table is marked as crashed"));
my_errno=((share->state.changed & STATE_CRASHED_ON_REPAIR) ?
- HA_ERR_CRASHED_ON_REPAIR : HA_ERR_CRASHED);
+ HA_ERR_CRASHED_ON_REPAIR : HA_ERR_CRASHED_ON_USAGE);
goto err;
}
/* Correct max_file_length based on length of sizeof_t */
@@ -732,7 +732,8 @@ char *mi_state_info_read(char *ptr, MI_STATE_INFO *state)
state->process= mi_uint4korr(ptr); ptr +=4;
state->unique = mi_uint4korr(ptr); ptr +=4;
state->status = mi_uint4korr(ptr); ptr +=4;
- ptr +=4; /* extra */
+ state->update_count=mi_uint4korr(ptr); ptr +=4;
+
for (i=0; i < keys; i++)
{
state->key_root[i]= mi_sizekorr(ptr); ptr +=8;