Commit 3c112262 authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/psergey/mysql-4.1-look-range
parents ec280d6f 6b002314

mysql-test/r/range.result

+19 −0
Original line number Diff line number Diff line
@@ -577,3 +577,22 @@ id select_type table type possible_keys key key_len ref rows Extra 
explain select * from t1 where a='aaa' collate latin1_german1_ci;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	a	NULL	NULL	NULL	9	Using where

drop table t1;

CREATE TABLE t1 (

`CLIENT` char(3) character set latin1 collate latin1_bin NOT NULL default '000',

`ARG1` char(3) character set latin1 collate latin1_bin NOT NULL default '',

`ARG2` char(3) character set latin1 collate latin1_bin NOT NULL default '',

`FUNCTION` varchar(10) character set latin1 collate latin1_bin NOT NULL default '',

`FUNCTINT` int(11) NOT NULL default '0',

KEY `VERI_CLNT~2` (`ARG1`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES ('000',' 0',' 0','Text 001',0), ('000',' 0',' 1','Text 002',0),

('000',' 1',' 2','Text 003',0), ('000',' 2',' 3','Text 004',0),

('001',' 3',' 0','Text 017',0);

SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 1' OR ARG1 != ' 2');

count(*)

4

SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 2' OR ARG1 != ' 1');

count(*)

4

drop table t1;

mysql-test/t/range.test

+21 −0
Original line number Diff line number Diff line
@@ -445,3 +445,24 @@ explain select * from t1 where a=binary 'aaa'; 
explain select * from t1 where a='aaa' collate latin1_bin;

# this one cannot:

explain select * from t1 where a='aaa' collate latin1_german1_ci;

drop table t1;



# Test for BUG#9348 "result for WHERE A AND (B OR C) differs from WHERE a AND (C OR B)"

CREATE TABLE t1 (

  `CLIENT` char(3) character set latin1 collate latin1_bin NOT NULL default '000',

  `ARG1` char(3) character set latin1 collate latin1_bin NOT NULL default '',

  `ARG2` char(3) character set latin1 collate latin1_bin NOT NULL default '',

  `FUNCTION` varchar(10) character set latin1 collate latin1_bin NOT NULL default '',

  `FUNCTINT` int(11) NOT NULL default '0',

  KEY `VERI_CLNT~2` (`ARG1`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1;



INSERT INTO t1 VALUES ('000',' 0',' 0','Text 001',0), ('000',' 0',' 1','Text 002',0),

  ('000',' 1',' 2','Text 003',0), ('000',' 2',' 3','Text 004',0),

  ('001',' 3',' 0','Text 017',0);



SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 1' OR ARG1 != ' 2');



SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 2' OR ARG1 != ' 1');

drop table t1;

sql/opt_range.cc

+1 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,7 @@ key_or(SEL_ARG *key1,SEL_ARG *key2) 
	  last=last->next;

	  key1=key1->tree_delete(save);

	}

        last->copy_min(tmp);

	if (last->copy_min(key2) || last->copy_max(key2))

	{					// Full range

	  key1->free_tree();