bk commit into 4.1 tree (kaa:1.2541) BUG#22728

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
4.1 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-08 17:03:56+04:00, kaa@stripped +3 -0
  Fix for bug #22728 "Handler_rollback value is growing".
  
  For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of
thd->transaction.stmt.innobase_tid to see if we really need to rollback.

  mysql-test/r/innodb.result@stripped, 2006-10-08 17:03:54+04:00, kaa@stripped +10 -0
    Added testcase for bug #22728 "Handler_rollback value is growing"

  mysql-test/t/innodb.test@stripped, 2006-10-08 17:03:54+04:00, kaa@stripped +17 -1
    Added testcase for bug #22728 "Handler_rollback value is growing"

  sql/handler.cc@stripped, 2006-10-08 17:03:54+04:00, kaa@stripped +1 -1
    For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of
thd->transaction.stmt.innobase_tid to see if we really need to rollback.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	polly.local
# Root:	/tmp/maint/bug22728/my41-bug22728

--- 1.171/sql/handler.cc	2006-10-08 17:04:00 +04:00
+++ 1.172/sql/handler.cc	2006-10-08 17:04:00 +04:00
@@ -648,7 +648,7 @@ int ha_rollback_trans(THD *thd, THD_TRAN
     }
 #endif
 #ifdef HAVE_INNOBASE_DB
-    if (trans->innobase_tid)
+    if (thd->transaction.all.innodb_active_trans)
     {
       if ((error=innobase_rollback(thd, trans->innobase_tid)))
       {

--- 1.108/mysql-test/r/innodb.result	2006-10-08 17:04:00 +04:00
+++ 1.109/mysql-test/r/innodb.result	2006-10-08 17:04:00 +04:00
@@ -1807,3 +1807,13 @@ t2	CREATE TABLE `t2` (
   KEY `t2_ibfk_0` (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE t2,t1;
+flush status;
+create table t1 (c1 int) engine=innodb;
+handler t1 open;
+handler t1 read first;
+c1
+show /*!50002 GLOBAL */ status like 'Handler_rollback';
+Variable_name	Value
+Handler_rollback	0
+drop table t1;
+End of 4.1 tests

--- 1.80/mysql-test/t/innodb.test	2006-10-08 17:04:00 +04:00
+++ 1.81/mysql-test/t/innodb.test	2006-10-08 17:04:00 +04:00
@@ -1391,4 +1391,20 @@ ALTER TABLE t2 DROP FOREIGN KEY t2_ibfk_
 SHOW CREATE TABLE t2;
 DROP TABLE t2,t1;
 
-# End of 4.1 tests
+#
+# Bug #22728 - Handler_rollback value is growing
+#
+flush status;
+create table t1 (c1 int) engine=innodb;
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+connection con2;
+handler t1 open;
+handler t1 read first;
+disconnect con2;
+connection con1;
+show /*!50002 GLOBAL */ status like 'Handler_rollback';
+connection default;
+drop table t1;
+disconnect con1;
+--echo End of 4.1 tests