bk commit into 5.0 tree (kaa:1.2235)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 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-11 13:22:00+04:00, kaa@stripped +3 -0
  Manual merge
  MERGE: 1.1616.2658.18

  mysql-test/r/innodb_mysql.result@stripped, 2006-10-11 13:21:58+04:00, kaa@stripped +0 -0
    Manual merge
    MERGE: 1.3.2.1

  mysql-test/t/innodb_mysql.test@stripped, 2006-10-11 13:21:58+04:00, kaa@stripped +0 -2
    Manual merge
    MERGE: 1.3.2.1

  sql/handler.cc@stripped, 2006-10-11 13:21:58+04:00, kaa@stripped +0 -2
    Manual merge
    MERGE: 1.103.21.1

# 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/my50-bug22728/RESYNC

--- 1.217/sql/handler.cc	2006-10-11 13:22:06 +04:00
+++ 1.218/sql/handler.cc	2006-10-11 13:22:06 +04:00
@@ -1199,7 +1199,6 @@ int ha_rollback_to_savepoint(THD *thd, S
     { // cannot happen
       my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
       error=1;
-    }
     statistic_increment(thd->status_var.ha_rollback_count,&LOCK_status);
     *ht=0; // keep it conveniently zero-filled
   }

--- 1.6/mysql-test/r/innodb_mysql.result	2006-10-11 13:22:06 +04:00
+++ 1.7/mysql-test/r/innodb_mysql.result	2006-10-11 13:22:06 +04:00
@@ -54,6 +54,16 @@ c.c_id = 218 and expiredate is null;
 slai_id
 12
 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
 CREATE TABLE t1 (a int, b int, KEY b (b)) Engine=InnoDB;
 CREATE TABLE t2 (a int, b int, PRIMARY KEY  (a,b)) Engine=InnoDB;
 CREATE TABLE t3 (a int, b int, c int, PRIMARY KEY  (a), 

--- 1.6/mysql-test/t/innodb_mysql.test	2006-10-11 13:22:06 +04:00
+++ 1.7/mysql-test/t/innodb_mysql.test	2006-10-11 13:22:06 +04:00
@@ -59,6 +59,22 @@ where 
 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
 # Bug#17212: results not sorted correctly by ORDER BY when using index
 # (repeatable only w/innodb because of index props)
 #