bzr push into mysql-trunk-innodb branch (inaam.rana:3497 to 3498) Bug#59342

[Inaam Rana]

 3498 Inaam Rana	2011-02-14
      Bug #59342 innodb status prints "purge trx" next to any thread with id 0
      
      rb://596
      approved by: Sunny
      
      Do not print "purge trx" with trxs not started yet.
      Use trx->op_info to identify purge trx.

    modified:
      storage/innobase/trx/trx0purge.c
      storage/innobase/trx/trx0trx.c
 3497 Jimmy Yang	2011-02-14 [merge]
      Merge from mysql-5.5-innodb to mysql-trunk-innodb

    modified:
      storage/innobase/handler/handler0alter.cc
=== modified file 'storage/innobase/trx/trx0purge.c'
--- a/storage/innobase/trx/trx0purge.c	revid:jimmy.yang@stripped
+++ b/storage/innobase/trx/trx0purge.c	revid:inaam.rana@stripped
@@ -166,6 +166,7 @@ trx_purge_sys_create(
 	purge_sys->trx->id = 0;
 	purge_sys->trx->start_time = ut_time();
 	purge_sys->trx->state = TRX_STATE_ACTIVE;
+	purge_sys->trx->op_info = "purge trx";
 
 	purge_sys->query = trx_purge_graph_build(
 		purge_sys->trx, n_purge_threads);

=== modified file 'storage/innobase/trx/trx0trx.c'
--- a/storage/innobase/trx/trx0trx.c	revid:jimmy.yang@stripped
+++ b/storage/innobase/trx/trx0trx.c	revid:inaam.rana@stripped
@@ -1242,10 +1242,6 @@ state_ok:
 		fputs(" recovered trx", f);
 	}
 
-	if (trx->id == 0) {
-		fputs(" purge trx", f);
-	}
-
 	if (trx->declared_to_be_inside_innodb) {
 		fprintf(f, ", thread declared inside InnoDB %lu",
 			(ulong) trx->n_tickets_to_enter_innodb);


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