Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/bkroot/mysql-4.1
This commit is contained in:
unknown 2004-11-09 17:33:09 +01:00
commit 1043faa9b3

View file

@ -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));
}
}