Commit b64f46af authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.1 

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
parents 7304af7b 480a4ef9

mysql-test/r/alter_table.result

+36 −0
Original line number Diff line number Diff line
@@ -881,6 +881,42 @@ create table t1 (t varchar(255) default null, key t (t(80))) 
engine=myisam default charset=latin1;

alter table t1 change t t text;

drop table t1;

CREATE TABLE t1 (a varchar(500));

ALTER TABLE t1 ADD b GEOMETRY NOT NULL, ADD SPATIAL INDEX(b);

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(500) DEFAULT NULL,

  `b` geometry NOT NULL,

  SPATIAL KEY `b` (`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t1 ADD KEY(b(50));

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(500) DEFAULT NULL,

  `b` geometry NOT NULL,

  SPATIAL KEY `b` (`b`),

  KEY `b_2` (`b`(50))

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t1 ADD c POINT;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(500) DEFAULT NULL,

  `b` geometry NOT NULL,

  `c` point DEFAULT NULL,

  SPATIAL KEY `b` (`b`),

  KEY `b_2` (`b`(50))

) ENGINE=MyISAM DEFAULT CHARSET=latin1

CREATE TABLE t2 (a INT, KEY (a(20)));

ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys

ALTER TABLE t1 ADD d INT;

ALTER TABLE t1 ADD KEY (d(20));

ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys

ALTER TABLE t1 ADD e GEOMETRY NOT NULL, ADD SPATIAL KEY (e(30));

ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys

DROP TABLE t1;

CREATE TABLE t1 (s CHAR(8) BINARY);

INSERT INTO t1 VALUES ('test');

SELECT LENGTH(s) FROM t1;

mysql-test/r/endspace.result

+9 −6
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ insert into t1 values ('teststring'), ('nothing'), ('teststring\t'); 
check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

text1 like 'teststring_%' ORDER BY text1;

text1

teststring	

teststring
@@ -48,7 +49,8 @@ alter table t1 modify text1 char(32) binary not null; 
check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

text1 like 'teststring_%' ORDER BY text1;

text1

teststring	

teststring
@@ -132,7 +134,8 @@ concat('|', text1, '|') 
drop table t1;

create table t1 (text1 varchar(32) not NULL, KEY key1 using BTREE (text1)) engine=heap;

insert into t1 values ('teststring'), ('nothing'), ('teststring\t');

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

text1 like 'teststring_%' ORDER BY text1;

text1

teststring	

teststring

mysql-test/r/gis-rtree.result

+5 −5
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ t1 CREATE TABLE `t1` ( 
  `fid` int(11) NOT NULL AUTO_INCREMENT,

  `g` geometry NOT NULL,

  PRIMARY KEY (`fid`),

  SPATIAL KEY `g` (`g`(32))

  SPATIAL KEY `g` (`g`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

INSERT INTO t1 (g) VALUES (GeomFromText('LineString(150 150, 150 150)'));

INSERT INTO t1 (g) VALUES (GeomFromText('LineString(149 149, 151 151)'));
@@ -293,7 +293,7 @@ t2 CREATE TABLE `t2` ( 
  `fid` int(11) NOT NULL AUTO_INCREMENT,

  `g` geometry NOT NULL,

  PRIMARY KEY (`fid`),

  SPATIAL KEY `g` (`g`(32))

  SPATIAL KEY `g` (`g`)

) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=latin1

SELECT count(*) FROM t2;

count(*)
@@ -803,7 +803,7 @@ CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom)); 
INSERT INTO t2 SELECT GeomFromText(st) FROM t1;

ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field

drop table t1, t2;

CREATE TABLE t1 (`geometry` geometry NOT NULL default '',SPATIAL KEY `gndx` (`geometry`(32))) ENGINE=MyISAM DEFAULT CHARSET=latin1;

CREATE TABLE t1 (`geometry` geometry NOT NULL default '',SPATIAL KEY `gndx` (`geometry`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;

Warnings:

Warning	1101	BLOB/TEXT column 'geometry' can't have a default value

INSERT INTO t1 (geometry) VALUES
@@ -820,7 +820,7 @@ test.t1 check status OK 
drop table t1;

CREATE TABLE t1 (

c1 geometry NOT NULL default '',

SPATIAL KEY i1 (c1(32))

SPATIAL KEY i1 (c1)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

Warnings:

Warning	1101	BLOB/TEXT column 'c1' can't have a default value
@@ -836,7 +836,7 @@ test.t1 check status OK 
DROP TABLE t1;

CREATE TABLE t1 (

c1 geometry NOT NULL default '',

SPATIAL KEY i1 (c1(32))

SPATIAL KEY i1 (c1)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

Warnings:

Warning	1101	BLOB/TEXT column 'c1' can't have a default value

mysql-test/r/group_by.result

+105 −7
Original line number Diff line number Diff line
@@ -1035,12 +1035,110 @@ HAVING SUM(t1_inner.b)+t1_outer.b > 5); 
ERROR 42000: 'test.t1_outer.b' isn't in GROUP BY

DROP TABLE t1;

SET SQL_MODE = '';

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

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

EXPLAIN SELECT a, SUM(b) FROM t1 GROUP BY a LIMIT 2;

CREATE TABLE t1 (a INT, b INT,

PRIMARY KEY (a),

KEY i2(a,b));

INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8);

INSERT INTO t1 SELECT a + 8,b FROM t1;

INSERT INTO t1 SELECT a + 16,b FROM t1;

INSERT INTO t1 SELECT a + 32,b FROM t1;

INSERT INTO t1 SELECT a + 64,b FROM t1;

INSERT INTO t1 SELECT a + 128,b FROM t1;

ANALYZE TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

EXPLAIN SELECT a FROM t1 WHERE a < 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	a	5	NULL	4	

EXPLAIN SELECT a, SUM(b) FROM t1 IGNORE INDEX (a) GROUP BY a LIMIT 2;

1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	2	Using where; Using index

EXPLAIN SELECT a FROM t1 WHERE a < 2 ORDER BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using temporary; Using filesort

DROP TABLE t1;
 
1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	2	Using where; Using index

EXPLAIN SELECT a FROM t1 WHERE a < 2 GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	2	Using where; Using index

EXPLAIN SELECT a FROM t1 IGNORE INDEX (PRIMARY,i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR JOIN (PRIMARY,i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (PRIMARY,i2) GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	256	Using index

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY,i2) ORDER BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	256	Using index; Using filesort

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY)

IGNORE INDEX FOR GROUP BY (i2) GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	256	Using index

EXPLAIN SELECT a FROM t1 IGNORE INDEX (PRIMARY) IGNORE INDEX FOR ORDER BY (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 FORCE INDEX (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 USE INDEX ();

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 USE INDEX () USE INDEX (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 

FORCE INDEX (PRIMARY) 

IGNORE INDEX FOR GROUP BY (i2)

IGNORE INDEX FOR ORDER BY (i2)

USE INDEX (i2);

ERROR HY000: Incorrect usage of USE INDEX and FORCE INDEX

EXPLAIN SELECT a FROM t1 USE INDEX (i2) USE INDEX ();

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 FORCE INDEX ();

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1

EXPLAIN SELECT a FROM t1 IGNORE INDEX ();

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1

EXPLAIN SELECT a FROM t1 USE INDEX FOR JOIN (i2) 

USE INDEX FOR GROUP BY (i2) GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 FORCE INDEX FOR JOIN (i2) 

FORCE INDEX FOR GROUP BY (i2) GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	i2	4	NULL	257	Using index for group-by

EXPLAIN SELECT a FROM t1 USE INDEX () IGNORE INDEX (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 IGNORE INDEX (i2) USE INDEX ();

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 

USE INDEX FOR GROUP BY (i2) 

USE INDEX FOR ORDER BY (i2)

USE INDEX FOR JOIN (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 

USE INDEX FOR JOIN (i2) 

USE INDEX FOR JOIN (i2) 

USE INDEX FOR JOIN (i2,i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT 1 FROM t1 WHERE a IN

(SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	index	NULL	PRIMARY	4	NULL	256	Using where; Using index

2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	256	Using where

CREATE TABLE t2 (a INT, b INT, KEY(a));

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

EXPLAIN SELECT a, SUM(b) FROM t2 GROUP BY a LIMIT 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	a	5	NULL	4	

EXPLAIN SELECT a, SUM(b) FROM t2 IGNORE INDEX (a) GROUP BY a LIMIT 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

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

EXPLAIN SELECT 1 FROM t2 WHERE a IN

(SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t2	index	NULL	a	5	NULL	4	Using where; Using index

2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	256	Using where

DROP TABLE t1, t2;

mysql-test/r/key.result

+41 −0
Original line number Diff line number Diff line
@@ -489,3 +489,44 @@ EXPLAIN SELECT MAX(a) FROM t1 FORCE INDEX(a); 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	

drop table t1;

CREATE TABLE t1 (

a INTEGER auto_increment PRIMARY KEY,

b INTEGER NOT NULL,

c INTEGER NOT NULL,

d CHAR(64)

);

CREATE TABLE t2 (

a INTEGER auto_increment PRIMARY KEY,

b INTEGER NOT NULL,

c SMALLINT NOT NULL,

d DATETIME NOT NULL,

e SMALLINT NOT NULL,

f INTEGER NOT NULL,

g INTEGER NOT NULL,  

h SMALLINT NOT NULL,

i INTEGER NOT NULL,

j INTEGER NOT NULL,

UNIQUE INDEX (b),

INDEX (b, d, e, f, g, h, i, j, c),

INDEX (c)

);

INSERT INTO t2 VALUES 

(NULL, 1, 254, '1000-01-01 00:00:00', 257, 0, 0, 0, 0, 0),

(NULL, 2, 1, '2004-11-30 12:00:00', 1, 0, 0, 0, 0, 0),

(NULL, 3, 1, '2004-11-30 12:00:00', 1, 0, 0, 2, -21600, 0),

(NULL, 4, 1, '2004-11-30 12:00:00', 1, 0, 0, 2, -10800, 0),

(NULL, 5, 1, '2004-11-30 12:00:00', 1, 0, 0, 5, -10800, 0),

(NULL, 6, 1, '2004-11-30 12:00:00', 102, 0, 0, 0, 0, 0),

(NULL, 7, 1, '2004-11-30 12:00:00', 105, 2, 0, 0, 0, 0),

(NULL, 8, 1, '2004-11-30 12:00:00', 105, 10, 0, 0, 0, 0);

INSERT INTO t1 (b, c, d) VALUES

(3388000, -553000, NULL),

(3388000, -553000, NULL);

SELECT *

FROM t2 c JOIN t1 pa ON c.b = pa.a 

WHERE c.c = 1

ORDER BY c.b, c.d

;

a	b	c	d	e	f	g	h	i	j	a	b	c	d

2	2	1	2004-11-30 12:00:00	1	0	0	0	0	0	2	3388000	-553000	NULL

DROP TABLE t1, t2;