summaryrefslogtreecommitdiff
path: root/storage/myisam/mi_locking.c
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-02-22 00:33:11 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-02-22 00:33:11 +0300
commit8c31c4d16cfe9c3bbafcb30d0cd70210f6f230d3 (patch)
tree94830ebea81e944773f55fcb501055d762e3db1d /storage/myisam/mi_locking.c
parentb3e01b6da86dca93764ea67673c8d34f63e94cd2 (diff)
parentae12a723605f5059d73ee9284fd78ecc7583fac2 (diff)
downloadmariadb-git-8c31c4d16cfe9c3bbafcb30d0cd70210f6f230d3.tar.gz
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Diffstat (limited to 'storage/myisam/mi_locking.c')
-rw-r--r--storage/myisam/mi_locking.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c
index 8a5866ae763..210508d3e18 100644
--- a/storage/myisam/mi_locking.c
+++ b/storage/myisam/mi_locking.c
@@ -321,8 +321,8 @@ void mi_update_status(void* param)
(long) info->s->state.state.data_file_length));
#endif
info->s->state.state= *info->state;
- info->state= &info->s->state.state;
}
+ info->state= &info->s->state.state;
info->append_insert_at_end= 0;
/*