Commit 0c6731fd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
parents f47c2328 2016b21c

mysql-test/r/delete.result

+9 −0
Original line number Diff line number Diff line
@@ -214,3 +214,12 @@ select count(*) from t1; 
count(*)

0

drop table t1;

CREATE TABLE t1 (a INT);

INSERT INTO t1 VALUES (1);

DELETE FROM t1 ORDER BY x;

ERROR 42S22: Unknown column 'x' in 'order clause'

DELETE FROM t1 ORDER BY t2.x;

ERROR 42S22: Unknown column 't2.x' in 'order clause'

DELETE FROM t1 ORDER BY (SELECT x);

ERROR 42S22: Unknown column 'x' in 'field list'

DROP TABLE t1;

mysql-test/r/func_gconcat.result

+10 −0
Original line number Diff line number Diff line
@@ -728,3 +728,13 @@ f2 group_concat(f1) 
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	1

bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	2

drop table t1;

CREATE TABLE t1(a TEXT, b CHAR(20));

INSERT INTO t1 VALUES ("one.1","one.1"),("two.2","two.2"),("one.3","one.3");

SELECT GROUP_CONCAT(DISTINCT UCASE(a)) FROM t1;

GROUP_CONCAT(DISTINCT UCASE(a))

ONE.1,TWO.2,ONE.3

SELECT GROUP_CONCAT(DISTINCT UCASE(b)) FROM t1;

GROUP_CONCAT(DISTINCT UCASE(b))

ONE.1,TWO.2,ONE.3

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/gis.result

+17 −0
Original line number Diff line number Diff line
@@ -730,6 +730,12 @@ point(b, b) IS NULL linestring(b) IS NULL polygon(b) IS NULL multipoint(b) IS NU 
1	1	1	1	1	1	1

0	1	1	1	1	1	1

drop table t1;

CREATE TABLE t1(a POINT) ENGINE=MyISAM;

INSERT INTO t1 VALUES (NULL);

SELECT * FROM t1;

a

NULL

DROP TABLE t1;

End of 4.1 tests

create table t1 (s1 geometry not null,s2 char(100));

create trigger t1_bu before update on t1 for each row set new.s1 = null;
@@ -763,3 +769,14 @@ create table t1 (g geometry not null); 
insert into t1 values(default);

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

drop table t1;

CREATE TABLE t1 (a GEOMETRY);

CREATE VIEW v1 AS SELECT GeomFromwkb(ASBINARY(a)) FROM t1;

CREATE VIEW v2 AS SELECT a FROM t1;

DESCRIBE v1;

Field	Type	Null	Key	Default	Extra

GeomFromwkb(ASBINARY(a))	geometry	YES		NULL	

DESCRIBE v2;

Field	Type	Null	Key	Default	Extra

a	geometry	YES		NULL	

DROP VIEW v1,v2;

DROP TABLE t1;

mysql-test/r/insert_update.result

+78 −0
Original line number Diff line number Diff line
@@ -258,3 +258,81 @@ SELECT LAST_INSERT_ID(); 
LAST_INSERT_ID()

1

DROP TABLE t1;

SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO';

CREATE TABLE `t1` (

`id` int(11) PRIMARY KEY auto_increment,

`f1` varchar(10) NOT NULL UNIQUE

);

INSERT IGNORE INTO t1 (f1) VALUES ("test1")

ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id);

INSERT IGNORE INTO t1 (f1) VALUES ("test1")

ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id);

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

1

SELECT * FROM t1;

id	f1

1	test1

INSERT IGNORE INTO t1 (f1) VALUES ("test2")

ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id);

SELECT * FROM t1;

id	f1

1	test1

2	test2

INSERT IGNORE INTO t1 (f1) VALUES ("test2")

ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id);

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

2

SELECT * FROM t1;

id	f1

1	test1

2	test2

INSERT IGNORE INTO t1 (f1) VALUES ("test3")

ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id);

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

3

SELECT * FROM t1;

id	f1

1	test1

2	test2

3	test3

DROP TABLE t1;

CREATE TABLE `t1` (

`id` int(11) PRIMARY KEY auto_increment,

`f1` varchar(10) NOT NULL UNIQUE

);

INSERT IGNORE INTO t1 (f1) VALUES ("test1")

ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id);

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

1

SELECT * FROM t1;

id	f1

1	test1

INSERT IGNORE INTO t1 (f1) VALUES ("test1"),("test4")

ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id);

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

1

SELECT * FROM t1;

id	f1

1	test1

2	test4

DROP TABLE t1;

CREATE TABLE `t1` (

`id` int(11) PRIMARY KEY auto_increment,

`f1` varchar(10) NOT NULL UNIQUE,

tim1 timestamp default '2003-01-01 00:00:00' on update current_timestamp

);

INSERT INTO t1 (f1) VALUES ("test1");

SELECT id, f1 FROM t1;

id	f1

1	test1

REPLACE INTO t1 VALUES (0,"test1",null);

SELECT id, f1 FROM t1;

id	f1

0	test1

DROP TABLE t1;

SET SQL_MODE='';

mysql-test/r/range.result

+141 −0
Original line number Diff line number Diff line
@@ -717,6 +717,147 @@ d8c4177d225791924.30714720 
d8c4177d2380fc201.39666693

d8c4177d24ccef970.14957924

DROP TABLE t1;

create table t1 (

c1  char(10), c2  char(10), c3  char(10), c4  char(10),

c5  char(10), c6  char(10), c7  char(10), c8  char(10),

c9  char(10), c10 char(10), c11 char(10), c12 char(10),

c13 char(10), c14 char(10), c15 char(10), c16 char(10),

index(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,c13,c14,c15,c16)

);

insert into t1 (c1) values ('1'),('1'),('1'),('1');

select * from t1 where

c1 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4",

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c2 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4", 

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c3 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4", 

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c4 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4", 

"abcdefg5", "123456785", "qwertyui5", "asddfg5", 

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c5 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4",

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c6 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4",

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c7 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4", 

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c8 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4", 

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c9 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4", 

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")

and c10 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 

"abcdefg1", "123456781", "qwertyui1", "asddfg1", 

"abcdefg2", "123456782", "qwertyui2", "asddfg2", 

"abcdefg3", "123456783", "qwertyui3", "asddfg3", 

"abcdefg4", "123456784", "qwertyui4", "asddfg4", 

"abcdefg5", "123456785", "qwertyui5", "asddfg5",

"abcdefg6", "123456786", "qwertyui6", "asddfg6",

"abcdefg7", "123456787", "qwertyui7", "asddfg7",

"abcdefg8", "123456788", "qwertyui8", "asddfg8",

"abcdefg9", "123456789", "qwertyui9", "asddfg9",

"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",

"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",

"abcdefgC", "12345678C", "qwertyuiC", "asddfgC");

c1	c2	c3	c4	c5	c6	c7	c8	c9	c10	c11	c12	c13	c14	c15	c16

drop table t1;

End of 4.1 tests

CREATE TABLE t1 (

id int(11) NOT NULL auto_increment,