bzr push into mysql-5.1-innodb branch (marko.makela:3653 to 3654)

[marko.makela]

 3654 Marko Mäkelä	2010-11-03
      rw_lock_debug_print(): Output the thread ID in unsigned format.

    modified:
      storage/innobase/sync/sync0rw.c
      storage/innodb_plugin/sync/sync0rw.c
 3653 Marko Mäkelä	2010-11-03
      Bug#57947 InnoDB diagnostics shows btr_block_get calls instead of real callers
      
      Improve the diagnostics of buffer pool accesses for B-trees,
      so that the file names and line numbers of the real calls are shown
      instead of the line of the buf_page_get() call in btr_block_get().
      
      btr_page_get(): Replaced with a macro.
      
      btr_block_get_func(): Renamed from btr_block_get(). Add file, line.
      
      btr_block_get(): A macro that passes the __FILE__, __LINE__ to
      btr_block_get_func().
      
      dict_truncate_index_tree(): Replace a btr_page_get() call
      with btr_block_get(), since we are only latching the page, not accessing it.

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/dict/dict0crea.c
      storage/innodb_plugin/include/btr0btr.h
      storage/innodb_plugin/include/btr0btr.ic
=== modified file 'storage/innobase/sync/sync0rw.c'
--- a/storage/innobase/sync/sync0rw.c	revid:marko.makela@strippedlsgb3c8yp1mx6m1
+++ b/storage/innobase/sync/sync0rw.c	revid:marko.makela@strippedn
@@ -888,7 +888,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) {

=== modified file 'storage/innodb_plugin/sync/sync0rw.c'
--- a/storage/innodb_plugin/sync/sync0rw.c	revid:marko.makela@strippedb3c8yp1mx6m1
+++ b/storage/innodb_plugin/sync/sync0rw.c	revid:marko.makela@stripped41n
@@ -988,7 +988,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]