summaryrefslogtreecommitdiff
path: root/storage/maria/trnman.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2014-01-25 15:41:08 +0200
committerSergei Golubchik <sergii@pisem.net>2014-01-25 15:41:08 +0200
commit3d67c68ad1219fff48a341f2197709bbca14f84f (patch)
tree75c8d51d9083e6f825dc020c37c2050661c0d4ec /storage/maria/trnman.c
parent0ad8eaeb56a049df2947516d3d7ec49301d8d09d (diff)
downloadmariadb-git-3d67c68ad1219fff48a341f2197709bbca14f84f.tar.gz
Fixed MDEV-4970: Wrong result with Aria table populated with disabled keys
Problem was that ALTER TABLE DISABLE KEYS incremented create_trid for the table, which made the new index entries invisible until the global trid catched up. Fixed by only updating create_trid if we are rewriting all rows and indexes. mysql-test/suite/maria/alter.result: Added test case mysql-test/suite/maria/alter.test: Added test case storage/maria/ha_maria.cc: Only updating create_trid if we are doing a full repair (and thus rewriting all rows and indexes). storage/maria/trnman.c: More DBUG_PRINT
Diffstat (limited to 'storage/maria/trnman.c')
-rw-r--r--storage/maria/trnman.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/trnman.c b/storage/maria/trnman.c
index 2e27d8a4dc5..e5077adc9b7 100644
--- a/storage/maria/trnman.c
+++ b/storage/maria/trnman.c
@@ -383,8 +383,8 @@ TRN *trnman_new_trn(WT_THD *wt)
return 0;
}
- DBUG_PRINT("exit", ("trn: 0x%lx trid: 0x%lu",
- (ulong) trn, (ulong) trn->trid));
+ DBUG_PRINT("exit", ("trn: %p trid: 0x%lu min_read_from: 0x%lu",
+ trn, (ulong) trn->trid, (ulong) trn->min_read_from));
DBUG_RETURN(trn);
}