bzr push into mysql-trunk branch (marko.makela:3517 to 3518)

[marko.makela]

 3518 Marko Mäkelä	2011-10-21 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/btr/btr0cur.c
 3517 Jimmy Yang	2011-10-20
      Fix Bug #12941439 - WITH UNIV_SYNC_DEBUG, PERF SCHEMA, INITIALIZATION OF
      16G BUFFER POOL TAKES HOURS. "block->debug"_latch should be under
      "PFS_SKIP_BUFFER_MUTEX_RWLOCK" control and being skipped by default

    modified:
      storage/innobase/buf/buf0buf.c
=== modified file 'storage/innobase/btr/btr0cur.c'
--- a/storage/innobase/btr/btr0cur.c	revid:jimmy.yang@strippedlrwkvpchu39k
+++ b/storage/innobase/btr/btr0cur.c	revid:marko.makela@stripped
@@ -3567,16 +3567,11 @@ btr_record_not_null_field_in_rec(
 	}
 
 	for (i = 0; i < n_unique; i++) {
-		ulint	rec_len;
-
-		rec_get_nth_field_offs(offsets, i, &rec_len);
-
-		if (rec_len != UNIV_SQL_NULL) {
-			n_not_null[i]++;
-		} else {
-			/* Break if we hit the first NULL value */
+		if (rec_offs_nth_sql_null(offsets, i)) {
 			break;
 		}
+
+		n_not_null[i]++;
 	}
 }
 
@@ -3720,8 +3715,7 @@ btr_estimate_number_of_different_key_val
 
 			if (n_not_null) {
 				btr_record_not_null_field_in_rec(
-					n_cols, offsets_next_rec,
-					n_not_null);
+					n_cols, offsets_next_rec, n_not_null);
 			}
 
 			total_external_size

No bundle (reason: useless for push emails).