bzr push into mysql-5.5 branch (marko.makela:3501 to 3502)

[marko.makela]

 3502 Marko Mäkelä	2011-08-22 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      extra/innochecksum.c
      storage/innobase/sync/sync0sync.c
 3501 Joerg Bruehe	2011-08-19 [merge]
      Null-upmerge the bug#37165 fix: No functional change,
      but some notation improvement is applicable.

    modified:
      support-files/mysql.spec.sh
=== modified file 'extra/innochecksum.c'
--- a/extra/innochecksum.c	revid:joerg.bruehe@stripped110819172627-g4ovz7q8ojfdpjr0
+++ b/extra/innochecksum.c	revid:marko.makela@stripped0d2j
@@ -25,12 +25,7 @@
   Published with a permission.
 */
 
-/* needed to have access to 64 bit file functions */
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-
-#define _XOPEN_SOURCE 500 /* needed to include getopt.h on some platforms. */
-
+#include <my_global.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -53,7 +48,6 @@
 /* another argument to specify page ranges... seek to right spot and go from there */
 
 typedef unsigned long int ulint;
-typedef unsigned char uchar;
 
 /* innodb function in name; modified slightly to not have the ASM version (lots of #ifs that didn't apply) */
 ulint mach_read_from_4(uchar *b)

=== modified file 'storage/innobase/sync/sync0sync.c'
--- a/storage/innobase/sync/sync0sync.c	revid:joerg.bruehe@stripped4ovz7q8ojfdpjr0
+++ b/storage/innobase/sync/sync0sync.c	revid:marko.makela@strippedd2j
@@ -1329,7 +1329,13 @@ sync_thread_add_level(
 					     TRUE));
 		break;
 	case SYNC_IBUF_TREE_NODE_NEW:
-		ut_a(sync_thread_levels_contain(array, SYNC_IBUF_MUTEX));
+		/* ibuf_add_free_page() allocates new pages for the
+		change buffer while only holding the tablespace
+		x-latch. These pre-allocated new pages may only be
+		taken in use while holding ibuf_mutex, in
+		btr_page_alloc_for_ibuf(). */
+		ut_a(sync_thread_levels_contain(array, SYNC_IBUF_MUTEX)
+		     || sync_thread_levels_contain(array, SYNC_FSP));
 		break;
 	case SYNC_IBUF_INDEX_TREE:
 		if (sync_thread_levels_contain(array, SYNC_FSP)) {

No bundle (reason: useless for push emails).