diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-14 18:06:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-14 18:06:51 +0300 |
| commit | 1d15a28e52e41fae0847284089b2073ab33162a5 (patch) | |
| tree | 3d2dbd3ebda6547c26642e597b5cafc56e7ed031 /storage/maria | |
| parent | c4feef50cfa4033e646636ed37e255d2b3593fbf (diff) | |
| parent | a20f6f9853e522ad388f5b968ce11af3c5d1fc10 (diff) | |
| download | mariadb-git-1d15a28e52e41fae0847284089b2073ab33162a5.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/maria_chk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index aa2ad1d4618..54f7c21539b 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -1006,6 +1006,7 @@ static int maria_chk(HA_CHECK *param, char *filename) int error,lock_type,recreate; uint warning_printed_by_chk_status; my_bool rep_quick= MY_TEST(param->testflag & (T_QUICK | T_FORCE_UNIQUENESS)); + my_bool born_transactional; MARIA_HA *info; File datafile; char llbuff[22],llbuff2[22]; @@ -1448,6 +1449,7 @@ static int maria_chk(HA_CHECK *param, char *filename) maria_lock_database(info, F_UNLCK); end2: + born_transactional= share->base.born_transactional; if (maria_close(info)) { _ma_check_print_error(param, default_close_errmsg, my_errno, filename); @@ -1463,7 +1465,7 @@ end2: MYF(MY_REDEL_MAKE_BACKUP) : MYF(0))); } if (opt_transaction_logging && - share->base.born_transactional && !error && + born_transactional && !error && (param->testflag & (T_REP_ANY | T_SORT_RECORDS | T_SORT_INDEX | T_ZEROFILL))) error= write_log_record(param); |