bzr push into mysql-5.5-innodb branch (marko.makela:3222 to 3223)

[marko.makela]

 3223 Marko Mäkelä	2010-11-03 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/sync/sync0rw.c
 3222 Marko Mäkelä	2010-11-03 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/btr/btr0cur.c
      storage/innobase/dict/dict0crea.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0btr.ic
      storage/innobase/include/btr0cur.h
      storage/innobase/include/row0ins.h
      storage/innobase/include/row0upd.h
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0upd.c
=== modified file 'storage/innobase/sync/sync0rw.c'
--- a/storage/innobase/sync/sync0rw.c	revid:marko.makela@stripped73qo0gcguyo592i
+++ b/storage/innobase/sync/sync0rw.c	revid:marko.makela@stripped2
@@ -1002,7 +1002,7 @@ rw_lock_debug_print(
 
 	rwt	  = info->lock_type;
 
-	fprintf(stderr, "Locked: thread %ld file %s line %ld  ",
+	fprintf(stderr, "Locked: thread %lu file %s line %lu  ",
 		(ulong) os_thread_pf(info->thread_id), info->file_name,
 		(ulong) info->line);
 	if (rwt == RW_LOCK_SHARED) {

Attachment: [text/bzr-bundle] bzr/[e-mail]