List:Commits« Previous MessageNext Message »
From:Sunny Bains Date:April 30 2010 10:48am
Subject:bzr push into mysql-trunk-innodb branch (Sunny.Bains:3042 to 3043)
View as plain text  
 3043 Sunny Bains	2010-04-30
      Fix whitespace.

    modified:
      storage/innobase/handler/i_s.cc
 3042 Sunny Bains	2010-04-28
      Fix bug introduced by r3038. When a transaction is rolled back by the
      lock monitor thread, it may have locks that are granted to waited to
      waiting transactions. These waiting transactions will need to be woken
      up but their trx->lock_wait_timeout flag will be FALSE causing the old
      code to break. What we need is a flag that covers the entire lock
      release process not individual transactions. The fix is to move the
      flag out of trx_t and into srv_sys_t.

    modified:
      storage/innobase/include/trx0trx.h
      storage/innobase/srv/srv0srv.c
      storage/innobase/trx/trx0trx.c
=== modified file 'storage/innobase/handler/i_s.cc'
--- a/storage/innobase/handler/i_s.cc	revid:sunny.bains@stripped
+++ b/storage/innobase/handler/i_s.cc	revid:sunny.bains@stripped
@@ -1311,9 +1311,9 @@ static ST_FIELD_INFO	i_s_cmpmem_fields_i
 	STRUCT_FLD(field_length,	MY_INT32_NUM_DECIMAL_DIGITS),
 	STRUCT_FLD(field_type,		MYSQL_TYPE_LONG),
 	STRUCT_FLD(value,		0),
-	STRUCT_FLD(field_flags,	0),
+	STRUCT_FLD(field_flags,		0),
 	STRUCT_FLD(old_name,		"Buffer Pool Id"),
-	STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
+	STRUCT_FLD(open_method,		SKIP_OPEN_TABLE)},
 
 	{STRUCT_FLD(field_name,		"pages_used"),
 	 STRUCT_FLD(field_length,	MY_INT32_NUM_DECIMAL_DIGITS),
@@ -1345,7 +1345,7 @@ static ST_FIELD_INFO	i_s_cmpmem_fields_i
 	 STRUCT_FLD(value,		0),
 	 STRUCT_FLD(field_flags,	0),
 	 STRUCT_FLD(old_name,		"Total Duration of Relocations,"
-		    " in Seconds"),
+		    			" in Seconds"),
 	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
 
 	END_OF_ST_FIELD_INFO


Attachment: [text/bzr-bundle] bzr/sunny.bains@oracle.com-20100430104757-fkqgjv3ced5cbrvq.bundle
Thread
bzr push into mysql-trunk-innodb branch (Sunny.Bains:3042 to 3043) Sunny Bains30 Apr