From ec4059555b2c1aae031568ee72268ae49085ec0c Mon Sep 17 00:00:00 2001
From: marko <Unknown>
Date: Wed, 19 Sep 2007 11:31:00 +0000
Subject: [PATCH] branches/zip: cmp_rec_rec_simple(): Compare n_uniq columns
 instead of all columns present in offsets.  Add a const qualifier to the
 dict_index_t* parameter.

---
 include/rem0cmp.h | 14 +++++++-------
 rem/rem0cmp.c     | 28 ++++++++++++++++------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/include/rem0cmp.h b/include/rem0cmp.h
index c6d949a124f..362fd249c8c 100644
--- a/include/rem0cmp.h
+++ b/include/rem0cmp.h
@@ -133,13 +133,13 @@ none of which are stored externally. */
 int
 cmp_rec_rec_simple(
 /*===============*/
-				/* out: 1, 0 , -1 if rec1 is greater, equal,
-				less, respectively, than rec2 */
-	const rec_t*	rec1,	/* in: physical record */
-	const rec_t*	rec2,	/* in: physical record */
-	const ulint*	offsets1,/* in: rec_get_offsets(rec1, index) */
-	const ulint*	offsets2,/* in: rec_get_offsets(rec2, index) */
-	dict_index_t*	index);	/* in: data dictionary index */
+					/* out: 1, 0 , -1 if rec1 is greater,
+					equal, less, respectively, than rec2 */
+	const rec_t*		rec1,	/* in: physical record */
+	const rec_t*		rec2,	/* in: physical record */
+	const ulint*		offsets1,/* in: rec_get_offsets(rec1, index) */
+	const ulint*		offsets2,/* in: rec_get_offsets(rec2, index) */
+	const dict_index_t*	index);	/* in: data dictionary index */
 #endif /* !UNIV_HOTBACKUP */
 /*****************************************************************
 This function is used to compare two physical records. Only the common
diff --git a/rem/rem0cmp.c b/rem/rem0cmp.c
index 6c7359a3cef..f8353000d05 100644
--- a/rem/rem0cmp.c
+++ b/rem/rem0cmp.c
@@ -712,13 +712,13 @@ none of which are stored externally. */
 int
 cmp_rec_rec_simple(
 /*===============*/
-				/* out: 1, 0 , -1 if rec1 is greater, equal,
-				less, respectively, than rec2 */
-	const rec_t*	rec1,	/* in: physical record */
-	const rec_t*	rec2,	/* in: physical record */
-	const ulint*	offsets1,/* in: rec_get_offsets(rec1, index) */
-	const ulint*	offsets2,/* in: rec_get_offsets(rec2, index) */
-	dict_index_t*	index)	/* in: data dictionary index */
+					/* out: 1, 0 , -1 if rec1 is greater,
+					equal, less, respectively, than rec2 */
+	const rec_t*		rec1,	/* in: physical record */
+	const rec_t*		rec2,	/* in: physical record */
+	const ulint*		offsets1,/* in: rec_get_offsets(rec1, index) */
+	const ulint*		offsets2,/* in: rec_get_offsets(rec2, index) */
+	const dict_index_t*	index)	/* in: data dictionary index */
 {
 	ulint		rec1_f_len;	/* length of current field in rec1 */
 	const byte*	rec1_b_ptr;	/* pointer to the current byte
@@ -731,14 +731,15 @@ cmp_rec_rec_simple(
 	ulint		rec2_byte;	/* value of current byte to be
 					compared in rec2 */
 	ulint		cur_field;	/* current field number */
+	ulint		n_uniq;
+
+	n_uniq = dict_index_get_n_unique(index);
+	ut_ad(rec_offs_n_fields(offsets1) >= n_uniq);
+	ut_ad(rec_offs_n_fields(offsets2) >= n_uniq);
 
-	ut_ad(!rec_offs_any_extern(offsets1));
-	ut_ad(!rec_offs_any_extern(offsets2));
 	ut_ad(rec_offs_comp(offsets1) == rec_offs_comp(offsets2));
-	ut_ad(rec_offs_n_fields(offsets1) == rec_offs_n_fields(offsets2));
 
-	for (cur_field = 0; cur_field < rec_offs_n_fields(offsets1);
-	     cur_field++) {
+	for (cur_field = 0; cur_field < n_uniq; cur_field++) {
 
 		ulint	cur_bytes;
 		ulint	mtype;
@@ -752,6 +753,9 @@ cmp_rec_rec_simple(
 			prtype = col->prtype;
 		}
 
+		ut_ad(!rec_offs_nth_extern(offsets1, cur_field));
+		ut_ad(!rec_offs_nth_extern(offsets2, cur_field));
+
 		rec1_b_ptr = rec_get_nth_field(rec1, offsets1,
 					       cur_field, &rec1_f_len);
 		rec2_b_ptr = rec_get_nth_field(rec2, offsets2,