branches/zip: Merge 1553:1556 from trunk.

673f836f · marko · d9c3a96f · 673f836f · 673f836f
Commit 673f836f authored Jun 08, 2007 by marko
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

mysql-test/innodb_trx_weight.inc mysql-test/innodb_trx_weight.inc +2 -2

rem/rem0rec.c rem/rem0rec.c +2 -2

No files found.
--- a/mysql-test/innodb_trx_weight.inc
+++ b/mysql-test/innodb_trx_weight.inc
-- connect (con1,localhost,,,)
+-- connect (con1,localhost,root,,)
-- connect (con2,localhost,,,)
+-- connect (con2,localhost,root,,)
 -- connection con1
 SET autocommit=0;

--- 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 */
+		/* infimum or supremum record, 8 data bytes */
-		return(8); /* no extra data needed */
+		return(REC_N_NEW_EXTRA_BYTES + 8);
 	default:
 		ut_error;
 		return(ULINT_UNDEFINED);