bzr push into mysql-trunk-wl6255 branch (marko.makela:3887 to 3888) WL#6255

[marko.makela]

 3888 Marko Mäkelä	2012-05-29
      WL#6255 debug assertion relaxation
      
      rec_init_offsets_comp_ordinary():
      Allow n_null < index->n_nullable. Assert that of the processed fields,
      no more than n_null are NULLable.

    modified:
      storage/innobase/rem/rem0rec.cc
 3887 Marko Mäkelä	2012-05-28
      WL#6255 debug assertion relaxation
      
      rec_get_converted_size_comp_prefix(), rec_convert_dtuple_to_rec_comp():
      Allow n_null < index->n_nullable. Assert that of the processed fields,
      no more than n_null are NULLable.

    modified:
      storage/innobase/rem/rem0rec.cc
=== modified file 'storage/innobase/rem/rem0rec.cc'
--- a/storage/innobase/rem/rem0rec.cc	revid:marko.makela@stripped20528201908-do9ansu0pwdvq1je
+++ b/storage/innobase/rem/rem0rec.cc	revid:marko.makela@strippedi70kqyswnm5qt5
@@ -272,7 +272,6 @@ rec_init_offsets_comp_ordinary(
 	offsets[2] = (ulint) rec;
 	offsets[3] = (ulint) index;
 #endif /* UNIV_DEBUG */
-	ut_ad(n_null >= index->n_nullable);
 
 	/* read the lengths of fields 0..n */
 	do {
@@ -282,6 +281,7 @@ rec_init_offsets_comp_ordinary(
 		if (!(dict_field_get_col(field)->prtype
 		      & DATA_NOT_NULL)) {
 			/* nullable field => read the null flag */
+			ut_ad(n_null--);
 
 			if (UNIV_UNLIKELY(!(byte) null_mask)) {
 				nulls--;

No bundle (reason: useless for push emails).