Commit 1043faa9 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/bkroot/mysql-4.1
parents e741023f cbd92676

innobase/include/dict0dict.ic

+6 −3
Original line number Diff line number Diff line
@@ -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));

	}

}