bzr push into mysql-trunk branch (vasil.dimov:3642 to 3643)

[vasil.dimov]

 3643 Vasil Dimov	2011-11-22
      Fix a compilation warning about comparison between signed and unsigned
      inside UNIV_STATS_DEBUG, also use UINT64PF for printing ib_uint64_t
      variables.
      
      Spotted by:	Marko

    modified:
      storage/innobase/dict/dict0stats.cc
 3642 Marko Mäkelä	2011-11-22 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/btr/btr0cur.cc
      storage/innobase/include/btr0cur.h
=== modified file 'storage/innobase/dict/dict0stats.cc'
--- a/storage/innobase/dict/dict0stats.cc	revid:marko.makela@stripped
+++ b/storage/innobase/dict/dict0stats.cc	revid:[e-mail]-20111122122021-dt3r6x2dmxce2i5g
@@ -610,7 +610,7 @@ dict_stats_analyze_index_level(
 			     i, n_diff[i]);
 
 		if (n_diff_boundaries != NULL) {
-			ib_int64_t	j;
+			ib_uint64_t	j;
 
 			printf("boundaries: ");
 			for (j = 0; j < n_diff[i]; j++) {
@@ -620,7 +620,7 @@ dict_stats_analyze_index_level(
 					&n_diff_boundaries[i],
 					j * sizeof(ib_uint64_t));
 
-				printf("%lld=%llu, ", j, idx);
+				printf(UINT64PF "=" UINT64PF ", ", j, idx);
 			}
 			printf("\n");
 		}

No bundle (reason: useless for push emails).