Commit 9bec4188 authored by unknown's avatar unknown
Browse files

Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 

into moonbone.local:/work/merge-5.1


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/ctype-mb.c:
  Auto merged
parents c6f798a1 bdf32845

mysql-test/r/ctype_ucs.result

+26 −0
Original line number Diff line number Diff line
@@ -704,6 +704,32 @@ select f1 from t1 where f1 like 'a%'; 
f1

a

drop table t1;

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

utext

lily

river

execute stmt using @param1;

utext

lily

river

select utext from t1 where utext like '%%';

utext

lily

river

drop table t1;

deallocate prepare stmt;

CREATE TABLE t1 (id int, s char(5) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci);

INSERT INTO t1 VALUES (1, 'ZZZZZ'), (1, 'ZZZ'), (2, 'ZZZ'), (2, 'ZZZZZ');

SELECT id, MIN(s) FROM t1 GROUP BY id;

id	MIN(s)

1	ZZZ

2	ZZZ

DROP TABLE t1;

CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));

INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);

update t1 set b=a;

mysql-test/r/ctype_utf8.result

+129 −0
Original line number Diff line number Diff line
@@ -1152,6 +1152,135 @@ id a 
6	bbbbbb

11	bbbbbb

DROP TABLE t1;

SET NAMES utf8;

CREATE TABLE t1 (

a CHAR(13) DEFAULT '',

INDEX(a)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

INSERT INTO t1 VALUES 

('Käli Käli 2-4'), ('Käli Käli 2-4'),

('Käli Käli 2+4'), ('Käli Käli 2+4'),

('Käli Käli 2-6'), ('Käli Käli 2-6');

INSERT INTO t1 SELECT * FROM t1;

CREATE TABLE t2 (

a CHAR(13) DEFAULT '',

INDEX(a)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

INSERT INTO t2 VALUES

('Kali Kali 2-4'), ('Kali Kali 2-4'),

('Kali Kali 2+4'), ('Kali Kali 2+4'),

('Kali Kali 2-6'), ('Kali Kali 2-6');

INSERT INTO t2 SELECT * FROM t2;

SELECT a FROM t1 WHERE a LIKE 'Käli Käli 2+4';

a

Käli Käli 2+4

Käli Käli 2+4

Käli Käli 2+4

Käli Käli 2+4

SELECT a FROM t2 WHERE a LIKE 'Kali Kali 2+4';

a

Kali Kali 2+4

Kali Kali 2+4

Kali Kali 2+4

Kali Kali 2+4

EXPLAIN SELECT a FROM t1 WHERE a LIKE 'Käli Käli 2+4';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	a	a	40	NULL	4	Using where; Using index

EXPLAIN SELECT a FROM t1 WHERE a = 'Käli Käli 2+4';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	a	a	40	const	4	Using where; Using index

EXPLAIN SELECT a FROM t2 WHERE a LIKE 'Kali Kali 2+4';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	range	a	a	14	NULL	4	Using where; Using index

EXPLAIN SELECT a FROM t2 WHERE a = 'Kali Kali 2+4';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	a	a	14	const	4	Using where; Using index

DROP TABLE t1,t2;

CREATE TABLE t1 (

a char(255) DEFAULT '', 

KEY(a(10))

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

INSERT INTO t1 VALUES ('Käli Käli 2-4');

SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';

a

Käli Käli 2-4

INSERT INTO t1 VALUES ('Käli Käli 2-4');

SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';

a

Käli Käli 2-4

Käli Käli 2-4

DROP TABLE t1;

CREATE TABLE t1 (

a char(255) DEFAULT ''

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

INSERT INTO t1 VALUES ('Käli Käli 2-4');

INSERT INTO t1 VALUES ('Käli Käli 2-4');

SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';

a

Käli Käli 2-4

Käli Käli 2-4

ALTER TABLE t1 ADD KEY (a(10));

SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';

a

Käli Käli 2-4

Käli Käli 2-4

DROP TABLE t1;

SET NAMES latin2;

CREATE TABLE t1 (

id int(11) NOT NULL default '0',

tid int(11) NOT NULL default '0',

val text NOT NULL,

INDEX idx(tid, val(10))

) ENGINE=MyISAM DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES

(40988,72,'VOLN ADSL'),(41009,72,'VOLN ADSL'),

(41032,72,'VOLN ADSL'),(41038,72,'VOLN ADSL'),

(41063,72,'VOLN ADSL'),(41537,72,'VOLN ADSL Office'),

(42141,72,'VOLN ADSL'),(42565,72,'VOLN ADSL Combi'),

(42749,72,'VOLN ADSL'),(44205,72,'VOLN ADSL');

SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLNY ADSL';

id	tid	val

40988	72	VOLN ADSL

41009	72	VOLN ADSL

41032	72	VOLN ADSL

41038	72	VOLN ADSL

41063	72	VOLN ADSL

42141	72	VOLN ADSL

42749	72	VOLN ADSL

44205	72	VOLN ADSL

SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN ADSL';

id	tid	val

40988	72	VOLN ADSL

41009	72	VOLN ADSL

41032	72	VOLN ADSL

41038	72	VOLN ADSL

41063	72	VOLN ADSL

42141	72	VOLN ADSL

42749	72	VOLN ADSL

44205	72	VOLN ADSL

SELECT * FROM t1 WHERE tid=72 and val LIKE '%VOLN ADSL';

id	tid	val

40988	72	VOLN ADSL

41009	72	VOLN ADSL

41032	72	VOLN ADSL

41038	72	VOLN ADSL

41063	72	VOLN ADSL

42141	72	VOLN ADSL

42749	72	VOLN ADSL

44205	72	VOLN ADSL

ALTER TABLE t1 DROP KEY idx;

ALTER TABLE t1 ADD KEY idx (tid,val(11));

SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN ADSL';

id	tid	val

40988	72	VOLN ADSL

41009	72	VOLN ADSL

41032	72	VOLN ADSL

41038	72	VOLN ADSL

41063	72	VOLN ADSL

42141	72	VOLN ADSL

42749	72	VOLN ADSL

44205	72	VOLN ADSL

DROP TABLE t1;

CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');

SELECT id FROM t1;

mysql-test/r/distinct.result

+51 −0
Original line number Diff line number Diff line
@@ -504,6 +504,57 @@ a 2 b 
2	2	4

3	2	5

DROP TABLE t1,t2;

CREATE TABLE t1(a INT PRIMARY KEY, b INT);

INSERT INTO t1 VALUES (1,1), (2,1), (3,1);

EXPLAIN SELECT DISTINCT a FROM t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	3	Using index

EXPLAIN SELECT DISTINCT a,b FROM t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	

EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1_1	ALL	NULL	NULL	NULL	NULL	3	Using temporary

1	SIMPLE	t1_2	index	NULL	PRIMARY	4	NULL	3	Using index; Distinct

EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2

WHERE t1_1.a = t1_2.a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1_1	ALL	PRIMARY	NULL	NULL	NULL	3	Using temporary

1	SIMPLE	t1_2	eq_ref	PRIMARY	PRIMARY	4	test.t1_1.a	1	Using index; Distinct

EXPLAIN SELECT a FROM t1 GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	3	Using index

EXPLAIN SELECT a,b FROM t1 GROUP BY a,b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	

EXPLAIN SELECT DISTINCT a,b FROM t1 GROUP BY a,b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	

CREATE TABLE t2(a INT, b INT, c INT, d INT, PRIMARY KEY (a,b));

INSERT INTO t2 VALUES (1,1,1,50), (1,2,3,40), (2,1,3,4);

EXPLAIN SELECT DISTINCT a FROM t2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	PRIMARY	8	NULL	3	Using index

EXPLAIN SELECT DISTINCT a,a FROM t2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	PRIMARY	8	NULL	3	Using index

EXPLAIN SELECT DISTINCT b,a FROM t2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	PRIMARY	8	NULL	3	Using index

EXPLAIN SELECT DISTINCT a,c FROM t2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	Using temporary

EXPLAIN SELECT DISTINCT c,a,b FROM t2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	

EXPLAIN SELECT DISTINCT a,b,d FROM t2 GROUP BY c,b,d;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	Using temporary; Using filesort

CREATE UNIQUE INDEX c_b_unq ON t2 (c,b);

EXPLAIN SELECT DISTINCT a,b,d FROM t2 GROUP BY c,b,d;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	

DROP TABLE t1,t2;

create table t1 (id int, dsc varchar(50));

insert into t1 values (1, "line number one"), (2, "line number two"), (3, "line number three");

select distinct id, IFNULL(dsc, '-') from t1;

mysql-test/t/ctype_ucs.test

+26 −0
Original line number Diff line number Diff line
@@ -439,6 +439,32 @@ insert into t1 values('a'); 
create index t1f1 on t1(f1);

select f1 from t1 where f1 like 'a%';

drop table t1;



#

# Bug#9442 Set parameter make query fail if column character set is UCS2

#

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

execute stmt using @param1;

select utext from t1 where utext like '%%';

drop table t1;

deallocate prepare stmt;



#

# Bug #20076: server crashes for a query with GROUP BY if MIN/MAX aggregation

#             over a 'ucs2' field uses a temporary table 

#



CREATE TABLE t1 (id int, s char(5) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci);

INSERT INTO t1 VALUES (1, 'ZZZZZ'), (1, 'ZZZ'), (2, 'ZZZ'), (2, 'ZZZZZ');



SELECT id, MIN(s) FROM t1 GROUP BY id;



DROP TABLE t1;

# End of 4.1 tests



#

mysql-test/t/ctype_utf8.test

+88 −0
Original line number Diff line number Diff line
@@ -938,6 +938,94 @@ SELECT id, a FROM t1 WHERE a='bbbbbb' ORDER BY b; 


DROP TABLE t1;



#

# Bug#16674: LIKE predicate for a utf8 character set column

#



SET NAMES utf8;



CREATE TABLE t1 (

  a CHAR(13) DEFAULT '',

  INDEX(a)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

INSERT INTO t1 VALUES 

 ('Käli Käli 2-4'), ('Käli Käli 2-4'),

 ('Käli Käli 2+4'), ('Käli Käli 2+4'),

 ('Käli Käli 2-6'), ('Käli Käli 2-6');

INSERT INTO t1 SELECT * FROM t1;



CREATE TABLE t2 (

  a CHAR(13) DEFAULT '',

  INDEX(a)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;



INSERT INTO t2 VALUES

 ('Kali Kali 2-4'), ('Kali Kali 2-4'),

 ('Kali Kali 2+4'), ('Kali Kali 2+4'),

 ('Kali Kali 2-6'), ('Kali Kali 2-6');

INSERT INTO t2 SELECT * FROM t2;



SELECT a FROM t1 WHERE a LIKE 'Käli Käli 2+4';

SELECT a FROM t2 WHERE a LIKE 'Kali Kali 2+4';



EXPLAIN SELECT a FROM t1 WHERE a LIKE 'Käli Käli 2+4';

EXPLAIN SELECT a FROM t1 WHERE a = 'Käli Käli 2+4';

EXPLAIN SELECT a FROM t2 WHERE a LIKE 'Kali Kali 2+4';

EXPLAIN SELECT a FROM t2 WHERE a = 'Kali Kali 2+4';



DROP TABLE t1,t2;



CREATE TABLE t1 (

  a char(255) DEFAULT '', 

  KEY(a(10))

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

INSERT INTO t1 VALUES ('Käli Käli 2-4');

SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';

INSERT INTO t1 VALUES ('Käli Käli 2-4');

SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';

DROP TABLE t1;



CREATE TABLE t1 (

  a char(255) DEFAULT ''

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

INSERT INTO t1 VALUES ('Käli Käli 2-4');

INSERT INTO t1 VALUES ('Käli Käli 2-4');

SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';

ALTER TABLE t1 ADD KEY (a(10));

SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';

DROP TABLE t1;



#

# Bug#18359: LIKE predicate for a 'utf8' text column with a partial index

#            (see bug #16674 as well)

#



SET NAMES latin2;



CREATE TABLE t1 (

  id int(11) NOT NULL default '0',

  tid int(11) NOT NULL default '0',

  val text NOT NULL,

  INDEX idx(tid, val(10))

) ENGINE=MyISAM DEFAULT CHARSET=utf8;



INSERT INTO t1 VALUES

  (40988,72,'VOLN ADSL'),(41009,72,'VOLN ADSL'),

  (41032,72,'VOLN ADSL'),(41038,72,'VOLN ADSL'),

  (41063,72,'VOLN ADSL'),(41537,72,'VOLN ADSL Office'),

  (42141,72,'VOLN ADSL'),(42565,72,'VOLN ADSL Combi'),

  (42749,72,'VOLN ADSL'),(44205,72,'VOLN ADSL');



SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLNY ADSL'; 

SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN ADSL'; 

SELECT * FROM t1 WHERE tid=72 and val LIKE '%VOLN ADSL'; 



ALTER TABLE t1 DROP KEY idx;

ALTER TABLE t1 ADD KEY idx (tid,val(11));



SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN ADSL'; 



DROP TABLE t1;

# End of 4.1 tests



#