diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
| commit | 3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e (patch) | |
| tree | da0e622896425203d23ecdfd1bc77b57e3502edf /storage/maria/ma_create.c | |
| parent | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (diff) | |
| parent | f83e594218a6d19da2fa1ea2a01d860c30fe2913 (diff) | |
| download | mariadb-git-3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e.tar.gz | |
Merge with 5.1 to get in changes from MySQL 5.1.55
Diffstat (limited to 'storage/maria/ma_create.c')
| -rw-r--r-- | storage/maria/ma_create.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 9cf042ed21e..e7459f0d81a 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -1387,7 +1387,13 @@ int _ma_update_state_lsns_sub(MARIA_SHARE *share, LSN lsn, TrID create_trid, share->state.skip_redo_lsn= share->state.is_of_horizon= lsn; share->state.create_trid= create_trid; mi_int8store(trid_buff, create_trid); - if (update_create_rename_lsn) + + /* + Update create_rename_lsn if update was requested or if the old one had an + impossible value. + */ + if (update_create_rename_lsn || + (share->state.create_rename_lsn > lsn && lsn != LSN_IMPOSSIBLE)) { share->state.create_rename_lsn= lsn; if (share->id != 0) |