bk commit into 5.1 tree (ingo:1.2161)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev 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.2161 06/03/10 17:52:28 ingo@stripped +8 -0
  Merge mysql.com:/home/mydev/mysql-5.0-bug14980
  into  mysql.com:/home/mydev/mysql-5.1-bug14980

  storage/myisam/mi_write.c
    1.57 06/03/10 17:52:21 ingo@stripped +0 -0
    Auto merged

  storage/myisam/mi_update.c
    1.21 06/03/10 17:52:21 ingo@stripped +0 -0
    Auto merged

  storage/myisam/mi_unique.c
    1.25 06/03/10 17:52:21 ingo@stripped +0 -0
    Auto merged

  storage/myisam/mi_rnext_same.c
    1.21 06/03/10 17:52:21 ingo@stripped +0 -0
    Auto merged

  storage/myisam/mi_key.c
    1.47 06/03/10 17:52:21 ingo@stripped +0 -0
    Auto merged

  storage/myisam/mi_write.c
    1.50.6.2 06/03/10 17:52:21 ingo@stripped +0 -0
    Merge rename: myisam/mi_write.c -> storage/myisam/mi_write.c

  storage/myisam/mi_update.c
    1.17.3.2 06/03/10 17:52:21 ingo@stripped +0 -0
    Merge rename: myisam/mi_update.c -> storage/myisam/mi_update.c

  storage/myisam/mi_unique.c
    1.22.2.2 06/03/10 17:52:21 ingo@stripped +0 -0
    Merge rename: myisam/mi_unique.c -> storage/myisam/mi_unique.c

  storage/myisam/mi_rnext_same.c
    1.16.4.2 06/03/10 17:52:21 ingo@stripped +0 -0
    Merge rename: myisam/mi_rnext_same.c -> storage/myisam/mi_rnext_same.c

  storage/myisam/mi_key.c
    1.38.9.2 06/03/10 17:52:21 ingo@stripped +0 -0
    Merge rename: myisam/mi_key.c -> storage/myisam/mi_key.c

  storage/myisam/mi_delete.c
    1.40 06/03/10 17:52:21 ingo@stripped +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.78 06/03/10 17:52:21 ingo@stripped +0 -0
    Auto merged

  include/my_base.h
    1.85 06/03/10 17:52:21 ingo@stripped +0 -0
    Auto merged

  storage/myisam/mi_delete.c
    1.33.7.2 06/03/10 17:52:20 ingo@stripped +0 -0
    Merge rename: myisam/mi_delete.c -> storage/myisam/mi_delete.c

# 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:	ingo
# Host:	synthia.local
# Root:	/home/mydev/mysql-5.1-bug14980/RESYNC

--- 1.84/include/my_base.h	2006-02-17 08:25:57 +01:00
+++ 1.85/include/my_base.h	2006-03-10 17:52:21 +01:00
@@ -423,7 +423,7 @@
 #define HA_STATE_BUFF_SAVED	512	/* If current keybuff is info->buff */
 #define HA_STATE_ROW_CHANGED	1024	/* To invalide ROW cache */
 #define HA_STATE_EXTEND_BLOCK	2048
-#define HA_STATE_RNEXT_SAME	4096	/* rnext_same was called */
+#define HA_STATE_RNEXT_SAME	4096	/* rnext_same occupied lastkey2 */
 
 /* myisampack expects no more than 32 field types. */
 enum en_fieldtype {

--- 1.77/mysql-test/r/myisam.result	2006-03-06 11:51:40 +01:00
+++ 1.78/mysql-test/r/myisam.result	2006-03-10 17:52:21 +01:00
@@ -729,6 +729,24 @@
 cip	time	score	bob
 1	00:01:00	0	NULL
 drop table t1;
+create table t1 (
+id1 int not null auto_increment,
+id2 int not null default '0',
+t text not null,
+primary key  (id1),
+key x (id2, t(32))
+) engine=myisam;
+insert into t1 (id2, t) values
+(10, 'abc'), (10, 'abc'), (10, 'abc'),
+(20, 'abc'), (20, 'abc'), (20, 'def'),
+(10, 'abc'), (10, 'abc');
+select count(*)   from t1 where id2 = 10;
+count(*)
+5
+select count(id1) from t1 where id2 = 10;
+count(id1)
+5
+drop table t1;
 set storage_engine=MyISAM;
 drop table if exists t1,t2,t3;
 --- Testing varchar ---