Commit da11d817 authored by unknown's avatar unknown
Browse files

Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 

into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/subselect3.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/gis.result:
  Manual merge
mysql-test/t/gis.test:
  Manual merge
sql/handler.cc:
  Manual merge
sql/item_sum.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
parents 7e1e2280 86a0ffdd

mysql-test/r/func_gconcat.result

+10 −0
Original line number Diff line number Diff line
@@ -734,3 +734,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

+11 −0
Original line number Diff line number Diff line
@@ -770,6 +770,17 @@ 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;

create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);

create view v1 as select * from t1;

desc v1;

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/subselect3.result

+0 −6
Original line number Diff line number Diff line
@@ -661,12 +661,6 @@ SELECT * FROM t1 GROUP by t1.a 
HAVING (MAX(t1.b) > (SELECT MAX(t2.b) FROM t2 WHERE t2.c < t1.c

HAVING MAX(t2.b+t1.a) < 10));

a	b	c

SELECT a, AVG(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=AVG(t1.b))

AS test FROM t1 GROUP BY a;

a	AVG(b)	test

1	4.0000	NULL

2	2.0000	k

3	2.5000	NULL

SELECT a,b,c FROM t1 WHERE b in (9,3,4) ORDER BY b,c;

a	b	c

1	3	c

mysql-test/t/func_gconcat.test

+11 −1
Original line number Diff line number Diff line
@@ -497,4 +497,14 @@ select f2,group_concat(f1) from t1 group by f2; 
--disable_metadata

drop table t1;



# End of 4.1 tests
 
#

# Bug #26815: Unexpected built-in function behavior: group_concat(distinct

# substring_index())

# 

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;

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

DROP TABLE t1;



--echo End of 5.0 tests