List:Commits« Previous MessageNext Message »
From:Mark Leith Date:June 30 2010 9:15am
Subject:bzr push into mysql-trunk-innodb branch (mark.leith:3128 to 3129) Bug#54726
View as plain text  
 3129 Mark Leith	2010-06-30
      Bug#54726 - Inconsistent reporting between mutex and RW lock spin rounds
       - Add round counts to the output for RW s/x locks

    modified:
      storage/innobase/sync/sync0sync.c
 3128 Marko Mäkelä	2010-06-29
      Merge Bug#54408 fix from mysql-5.1-innodb:
      ------------------------------------------------------------
      revno: 3531
      revision-id: marko.makela@strippedvqe
      parent: marko.makela@strippedt799e5x30h31cvrd
      committer: Marko Mäkelä <marko.makela@stripped>
      branch nick: 5.1-innodb
      timestamp: Tue 2010-06-29 16:00:58 +0300
      message:
        Bug#54408: txn rollback after recovery: row0umod.c:673
        dict_table_get_format(index->table)
      
        The REDUNDANT and COMPACT formats store a local 768-byte prefix of
        each externally stored column. No row_ext cache is needed, but we
        initialized one nevertheless. When the BLOB pointer was zero, we would
        ignore the locally stored prefix as well. This triggered an assertion
        failure in row_undo_mod_upd_exist_sec().
      
        row_build(): Allow ext==NULL when a REDUNDANT or COMPACT table
        contains externally stored columns.
      
        row_undo_search_clust_to_pcur(), row_upd_store_row(): Invoke
        row_build() with ext==NULL on REDUNDANT and COMPACT tables.
      
        rb://382 approved by Jimmy Yang

    modified:
      storage/innobase/row/row0row.c
      storage/innobase/row/row0undo.c
      storage/innobase/row/row0upd.c
=== modified file 'storage/innobase/sync/sync0sync.c'
--- a/storage/innobase/sync/sync0sync.c	revid:marko.makela@strippedom-20100629132105-zzdqxv00w8r8hq6r
+++ b/storage/innobase/sync/sync0sync.c	revid:mark.leith@stripped104-yxpjqu3ruebif2jb
@@ -1492,14 +1492,16 @@ sync_print_wait_info(
 
 	fprintf(file,
 		"Mutex spin waits %llu, rounds %llu, OS waits %llu\n"
-		"RW-shared spins %llu, OS waits %llu;"
-		" RW-excl spins %llu, OS waits %llu\n",
+		"RW-shared spins %llu, rounds %llu, OS waits %llu\n"
+		"RW-excl spins %llu, rounds %llu, OS waits %llu\n",
 		mutex_spin_wait_count,
 		mutex_spin_round_count,
 		mutex_os_wait_count,
 		rw_s_spin_wait_count,
+		rw_s_spin_round_count,
 		rw_s_os_wait_count,
 		rw_x_spin_wait_count,
+		rw_x_spin_round_count,
 		rw_x_os_wait_count);
 
 	fprintf(file,

Attachment: [text/bzr-bundle] bzr/mark.leith@oracle.com-20100630091104-yxpjqu3ruebif2jb.bundle
Thread
bzr push into mysql-trunk-innodb branch (mark.leith:3128 to 3129) Bug#54726Mark Leith30 Jun