From 2d90ae68e74bcacf93635feecc86ee27dacb7db8 Mon Sep 17 00:00:00 2001
From: marko <>
Date: Fri, 8 Jun 2007 07:05:17 +0000
Subject: [PATCH] branches/zip: Merge 1553:1556 from trunk.

---
 mysql-test/innodb_trx_weight.inc | 4 ++--
 rem/rem0rec.c                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/innodb_trx_weight.inc b/mysql-test/innodb_trx_weight.inc
index 14d878f913f..56d3d47da36 100644
--- a/mysql-test/innodb_trx_weight.inc
+++ b/mysql-test/innodb_trx_weight.inc
@@ -1,5 +1,5 @@
--- connect (con1,localhost,,,)
--- connect (con2,localhost,,,)
+-- connect (con1,localhost,root,,)
+-- connect (con2,localhost,root,,)
 
 -- connection con1
 SET autocommit=0;
diff --git a/rem/rem0rec.c b/rem/rem0rec.c
index f894bdcc6b0..86b60b65abd 100644
--- a/rem/rem0rec.c
+++ b/rem/rem0rec.c
@@ -741,8 +741,8 @@ rec_get_converted_size_comp(
 		break;
 	case REC_STATUS_INFIMUM:
 	case REC_STATUS_SUPREMUM:
-		/* infimum or supremum record, 8 bytes */
-		return(8); /* no extra data needed */
+		/* infimum or supremum record, 8 data bytes */
+		return(REC_N_NEW_EXTRA_BYTES + 8);
 	default:
 		ut_error;
 		return(ULINT_UNDEFINED);