bzr push into mysql-trunk branch (marko.makela:3565 to 3567)

[marko.makela]

 3567 Marko Mäkelä	2011-11-07
      Remove a debug assertion that fails in innodb.innodb_mysql in a join.

    modified:
      storage/innobase/handler/ha_innodb.cc
 3566 Marko Mäkelä	2011-11-07 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/handler/ha_innodb.cc
 3565 Marko Mäkelä	2011-11-07 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@stripped0111107080013-tw27s0x7ilctnq44
+++ b/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@stripped20441-qc4yeadq7u1izh76
@@ -6314,6 +6314,7 @@ ha_innobase::index_read(
 			(byte*) key_ptr,
 			(ulint) key_len,
 			prebuilt->trx);
+		DBUG_ASSERT(prebuilt->search_tuple->n_fields > 0);
 	} else {
 		/* We position the cursor to the last or the first entry
 		in the index */
@@ -8284,6 +8285,9 @@ ha_innobase::records_in_range(
 					 (const uchar*) 0),
 				(ulint) (min_key ? min_key->length : 0),
 				prebuilt->trx);
+	DBUG_ASSERT(min_key
+		    ? range_start->n_fields > 0
+		    : range_start->n_fields == 0);
 
 	row_sel_convert_mysql_key_to_innobase(
 				range_end, (byte*) key_val_buff2,
@@ -8292,6 +8296,9 @@ ha_innobase::records_in_range(
 					 (const uchar*) 0),
 				(ulint) (max_key ? max_key->length : 0),
 				prebuilt->trx);
+	DBUG_ASSERT(max_key
+		    ? range_end->n_fields > 0
+		    : range_end->n_fields == 0);
 
 	mode1 = convert_search_mode_to_innobase(min_key ? min_key->flag :
 						HA_READ_KEY_EXACT);

No bundle (reason: useless for push emails).