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-12 16:07:57+04:00, kaa@stripped +3 -0
  Merge polly.local:/tmp/maint/bug22728/my41-bug22728
  into  polly.local:/tmp/maint/bug22728/my50-bug22728
  MERGE: 1.1616.2658.18

  mysql-test/r/innodb_mysql.result@stripped, 2006-10-12 16:07:55+04:00, kaa@stripped +10 -10
    Manually merged (will be null-merged later)
    MERGE: 1.3.2.1

  mysql-test/t/innodb_mysql.test@stripped, 2006-10-12 16:07:55+04:00, kaa@stripped +16 -18
    Manually merged (will be null-merged later)
    MERGE: 1.3.2.1

  sql/handler.cc@stripped, 2006-10-12 16:07:55+04:00, kaa@stripped +0 -1
    Manually merged (will be null-merged later)
    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.6/mysql-test/r/innodb_mysql.result	2006-10-12 16:08:03 +04:00
+++ 1.7/mysql-test/r/innodb_mysql.result	2006-10-12 16:08:03 +04:00
@@ -297,3 +297,13 @@ explain select distinct f1, f2 from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	NULL	PRIMARY	5	NULL	3	Using index for group-by; Using temporary
 drop table 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.6/mysql-test/t/innodb_mysql.test	2006-10-12 16:08:03 +04:00
+++ 1.7/mysql-test/t/innodb_mysql.test	2006-10-12 16:08:03 +04:00
@@ -255,3 +255,19 @@ explain select distinct f1 a, f1 b from 
 explain select distinct f1, f2 from t1;
 drop table t1;
 
+# 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