diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-03-20 16:04:50 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-03-20 16:04:50 +0200 |
| commit | 690d8cc6ba993ad7364c966437a7f4b2d3fdfea3 (patch) | |
| tree | 1f9a02620afc8c73b81523f681b38fc3bba160e3 /storage/maria/ma_rename.c | |
| parent | a579adea666cffc3b59d24a3d400d93bc7693d8e (diff) | |
| download | mariadb-git-690d8cc6ba993ad7364c966437a7f4b2d3fdfea3.tar.gz | |
Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed in join_read_const_table on concurrent SELECT and ALTER, constant Aria table"
Remove Aria state history for drop/rename
mysql-test/suite/maria/r/maria-recovery2.result:
Updated old (wrong) test result
sql/handler.cc:
Fixed wrong argument to implict_commit
storage/maria/ha_maria.cc:
Ensure that we don't use file->trn if THD_TRN is 0. (This means that implict_commit() has been called and the trn object is not ours anymore)
storage/maria/ma_extra.c:
Remove Aria state history for drop/rename
storage/maria/ma_rename.c:
Remove Aria state history for rename
storage/maria/ma_state.c:
More DBUG_PRINT
Diffstat (limited to 'storage/maria/ma_rename.c')
| -rw-r--r-- | storage/maria/ma_rename.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/maria/ma_rename.c b/storage/maria/ma_rename.c index 7db397617d4..2f798a95dc5 100644 --- a/storage/maria/ma_rename.c +++ b/storage/maria/ma_rename.c @@ -103,6 +103,7 @@ int maria_rename(const char *old_name, const char *new_name) } } + _ma_reset_state(info); maria_close(info); fn_format(from,old_name,"",MARIA_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT); |