bk commit into 4.1 tree (sergefp:1.2457)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
4.1 repository of psergey. When psergey 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
  1.2457 06/01/26 00:06:20 sergefp@stripped +2 -0
  Merge

  mysql-test/t/update.test
    1.28 06/01/26 00:06:17 sergefp@stripped +0 -1
    Merge

  mysql-test/r/update.result
    1.30 06/01/26 00:06:17 sergefp@stripped +0 -0
    Merge

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-4.1-bug15935/RESYNC

--- 1.29/mysql-test/r/update.result	2006-01-24 22:10:37 +03:00
+++ 1.30/mysql-test/r/update.result	2006-01-26 00:06:17 +03:00
@@ -358,6 +358,21 @@
 affected rows: 3
 info: Rows matched: 3  Changed: 3  Warnings: 0
 drop table t1,t2;
+create table t1 (a int);
+insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t2 (a int, filler1 char(200), filler2 char(200), key(a));
+insert into t2 select A.a + 10*B.a, 'filler','filler' from t1 A, t1 B;
+flush status;
+update t2 set a=3 where a=2;
+show status like 'handler_read%';
+Variable_name	Value
+Handler_read_first	0
+Handler_read_key	1
+Handler_read_next	1
+Handler_read_prev	0
+Handler_read_rnd	1
+Handler_read_rnd_next	0
+drop table t1, t2;
 create table t1(f1 int, `*f2` int);
 insert into t1 values (1,1);
 update t1 set `*f2`=1;

--- 1.27/mysql-test/t/update.test	2006-01-24 22:10:37 +03:00
+++ 1.28/mysql-test/t/update.test	2006-01-26 00:06:17 +03:00
@@ -288,6 +288,17 @@
 --disable_info
 drop table t1,t2;
 
+
+# BUG#15935
+create table t1 (a int);
+insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t2 (a int, filler1 char(200), filler2 char(200), key(a));
+insert into t2 select A.a + 10*B.a, 'filler','filler' from t1 A, t1 B;
+flush status;
+update t2 set a=3 where a=2;
+show status like 'handler_read%';
+drop table t1, t2;
+
 #
 # Bug #16510 Updating field named like '*name' caused server crash
 #