#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/ based on revid:serg@stripped
2725 Michael Widenius 2009-02-01
Fixes Bug #40711 "Maria crash in my_no_flags_free"
modified:
storage/maria/ma_close.c
per-file messages:
storage/maria/ma_close.c
Reset state_history when closing file.
This fixes a race condition when the checkpoint is using the file while the file is beeing closed.
The bug was that checkpoint was accessing the freed state_history.
=== modified file 'storage/maria/ma_close.c'
--- a/storage/maria/ma_close.c 2008-12-09 09:56:02 +0000
+++ b/storage/maria/ma_close.c 2009-02-01 07:29:56 +0000
@@ -155,7 +155,7 @@ int maria_close(register MARIA_HA *info)
MARIA_STATE_HISTORY_CLOSED *history;
/*
Here we ignore the unlikely case that we don't have memory to
- store the case. In the worst case what happens is that any transaction
+ store the state. In the worst case what happens is that any transaction
that tries to access this table will get a wrong status information.
*/
if ((history= (MARIA_STATE_HISTORY_CLOSED *)
@@ -166,6 +166,8 @@ int maria_close(register MARIA_HA *info)
if (my_hash_insert(&maria_stored_state, (uchar*) history))
my_free(history, MYF(0));
}
+ /* Marker for concurrent checkpoint */
+ share->state_history= 0;
}
}
pthread_mutex_unlock(&THR_LOCK_maria);
