branches/zip: Merge 1553:1556 from trunk.

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;

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