summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2004-11-09 15:59:45 +0200
committerunknown <heikki@hundin.mysql.fi>2004-11-09 15:59:45 +0200
commitcbd92676dd1a298d615132f48425daa418ee3a4c (patch)
treefdccc394a995d5163bc0b742910bc4ff514f1f11 /innobase
parent8e8c1a4756f04b582893965af0b780c2d32536f9 (diff)
downloadmariadb-git-cbd92676dd1a298d615132f48425daa418ee3a4c.tar.gz
dict0dict.ic:
Fix a bug in InnoDB code that fortunately was never used: row id is stored in a record always as a 6-byte unsigned integer, in a 'non-compressed' form innobase/include/dict0dict.ic: Fix a bug in InnoDB code that fortunately was never used: row id is stored in a record always as a 6-byte unsigned integer, in a 'non-compressed' form
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/dict0dict.ic9
1 files changed, 6 insertions, 3 deletions
diff --git a/innobase/include/dict0dict.ic b/innobase/include/dict0dict.ic
index 0f7cc8973db..85e4aaf1a05 100644
--- a/innobase/include/dict0dict.ic
+++ b/innobase/include/dict0dict.ic
@@ -342,13 +342,16 @@ dict_index_rec_get_sys_col(
ut_ad(len == 7);
return(trx_read_roll_ptr(field));
- } else if ((type == DATA_ROW_ID) || (type == DATA_MIX_ID)) {
+ } else if (type == DATA_TRX_ID) {
+
+ return(trx_read_trx_id(field));
+ } else if (type == DATA_MIX_ID) {
return(mach_dulint_read_compressed(field));
} else {
- ut_ad(type == DATA_TRX_ID);
+ ut_a(type == DATA_ROW_ID);
- return(trx_read_trx_id(field));
+ return(mach_read_from_6(field));
}
}