bk commit into 5.1 tree (igor:1.2344)

[igor]

Below is the list of changes that have just been committed into a local
5.1 repository of igor. When igor 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.2344 06/04/20 17:00:29 igor@stripped +2 -0
  Merge rurik.mysql.com:/home/igor/tmp_merge
  into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2

  sql/opt_range.cc
    1.213 06/04/20 17:00:22 igor@stripped +0 -0
    Auto merged

  mysql-test/r/index_merge_innodb.result
    1.17 06/04/20 17:00:21 igor@stripped +0 -0
    Auto merged

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.1-2/RESYNC

--- 1.212/sql/opt_range.cc	2006-04-06 10:26:21 -07:00
+++ 1.213/sql/opt_range.cc	2006-04-20 17:00:22 -07:00
@@ -4370,7 +4370,7 @@
                                                      sizeof(ROR_SCAN_INFO*)*
                                                      best_num)))
     DBUG_RETURN(NULL);
-  memcpy(trp->first_scan, ror_scan_mark, best_num*sizeof(ROR_SCAN_INFO*));
+  memcpy(trp->first_scan, tree->ror_scans, best_num*sizeof(ROR_SCAN_INFO*));
   trp->last_scan=  trp->first_scan + best_num;
   trp->is_covering= TRUE;
   trp->read_cost= total_cost;

--- 1.16/mysql-test/r/index_merge_innodb.result	2006-02-22 01:09:49 -08:00
+++ 1.17/mysql-test/r/index_merge_innodb.result	2006-04-20 17:00:21 -07:00
@@ -260,3 +260,25 @@
 7.6 	a 	    	
 7.6 	a 	    	
 drop table t1;
+create table t1 (
+pk int(11) not null auto_increment,
+a int(11) not null default '0',
+b int(11) not null default '0',
+c int(11) not null default '0',
+filler1 datetime, filler2 varchar(15),
+filler3 longtext,
+kp1 varchar(4), kp2 varchar(7),
+kp3 varchar(2), kp4 varchar(4),
+kp5 varchar(7),
+filler4 char(1),
+primary key (pk),
+key idx1(a,b,c),
+key idx2(c),
+key idx3(kp1,kp2,kp3,kp4,kp5)
+) engine=innodb default charset=latin1;
+set @fill=NULL;
+SELECT COUNT(*) FROM t1 WHERE b = 0 AND a = 0 AND c = 13286427 AND 
+kp1='279' AND kp2='ELM0678' AND kp3='6' AND kp4='10' AND  kp5 = 'R        ';
+COUNT(*)
+1
+drop table t1;