Merge polly.local:/tmp/maint/bug22728/my41-bug22728

into  polly.local:/home/kaa/src/maint/m41-maint--07OGk

mysql-test/r/innodb_mysql.result

@@ -104,3 +104,13 @@ SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` =
 id1
 2
 DROP TABLE t1, t2;
+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

mysql-test/t/innodb_mysql.test

@@ -117,3 +117,19 @@ INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES
 
 SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2);
 DROP TABLE t1, t2;
+# 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

sql/handler.cc

@@ -648,7 +648,7 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans)
     }
 #endif
 #ifdef HAVE_INNOBASE_DB
-    if (trans->innobase_tid)
+    if (thd->transaction.all.innodb_active_trans)
     {
       if ((error=innobase_rollback(thd, trans->innobase_tid)))
       {