diff options
Diffstat (limited to 'storage/maria/ha_maria.cc')
| -rw-r--r-- | storage/maria/ha_maria.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 1475cd52488..95ddde42e07 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -786,8 +786,11 @@ static int maria_create_trn_for_mysql(MARIA_HA *info) thd->query_length()); } else + { DBUG_PRINT("info", ("lock_type: %d trnman_flags: %u", - info->lock_type, trnman_get_flags(trn))); /* QQ */ + info->lock_type, trnman_get_flags(trn))); + } + #endif DBUG_RETURN(0); } @@ -2383,6 +2386,12 @@ int ha_maria::extra(enum ha_extra_function operation) int ha_maria::reset(void) { + if (file->trn) + { + /* Next statement is a new statement. Ensure it's logged */ + trnman_set_flags(file->trn, + trnman_get_flags(file->trn) & ~TRN_STATE_INFO_LOGGED); + } return maria_reset(file); } |