Commit c102fe94 authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/t/sp.test:
  Manual merge
parents ed19079c 45871dbf

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ t2 CREATE TABLE `t2` ( 
  `ifnull(h,h)` decimal(5,4) default NULL,

  `ifnull(i,i)` year(4) default NULL,

  `ifnull(j,j)` date default NULL,

  `ifnull(k,k)` datetime NOT NULL default '0000-00-00 00:00:00',

  `ifnull(k,k)` timestamp NOT NULL default '0000-00-00 00:00:00',

  `ifnull(l,l)` datetime default NULL,

  `ifnull(m,m)` varchar(1) default NULL,

  `ifnull(n,n)` varchar(3) default NULL,

mysql-test/r/func_gconcat.result

+13 −0
Original line number Diff line number Diff line
@@ -641,3 +641,16 @@ select charset(group_concat(c1 order by c2)) from t1; 
charset(group_concat(c1 order by c2))

latin1

drop table t1;

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

SET GROUP_CONCAT_MAX_LEN = 20000000;

INSERT INTO t1 VALUES (1,REPEAT(CONCAT('A',CAST(CHAR(0) AS BINARY),'B'), 40000));

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

SELECT a, CHAR_LENGTH(b) FROM t1;

a	CHAR_LENGTH(b)

1	120000

2	120000

SELECT CHAR_LENGTH( GROUP_CONCAT(b) ) FROM t1;

CHAR_LENGTH( GROUP_CONCAT(b) )

240001

SET GROUP_CONCAT_MAX_LEN = 1024;

DROP TABLE t1;

mysql-test/r/func_group.result

+11 −0
Original line number Diff line number Diff line
@@ -988,3 +988,14 @@ SUM(a) 
6

DROP TABLE t1;

set div_precision_increment= @sav_dpi;

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

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

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

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

SELECT SQL_NO_CACHE 

(SELECT SUM(c.a) FROM t1 ttt, t2 ccc 

WHERE ttt.a = ccc.b AND ttt.a = t.a GROUP BY ttt.a) AS minid   

FROM t1 t, t2 c WHERE t.a = c.b;

minid

NULL

DROP TABLE t1,t2;

mysql-test/r/func_str.result

+28 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,34 @@ a c 
abc	abc abc

xyz	xyz xyz

DROP TABLE t1;

CREATE TABLE t1 (s varchar(10));

INSERT INTO t1 VALUES ('yadda'), ('yaddy');

EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(s) > 'ab';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

Warnings:

Note	1003	select `test`.`t1`.`s` AS `s` from `test`.`t1` where (trim(`test`.`t1`.`s`) > _latin1'ab')

EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM('y' FROM s) > 'ab';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

Warnings:

Note	1003	select `test`.`t1`.`s` AS `s` from `test`.`t1` where (trim(both _latin1'y' from `test`.`t1`.`s`) > _latin1'ab')

EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(LEADING 'y' FROM s) > 'ab';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

Warnings:

Note	1003	select `test`.`t1`.`s` AS `s` from `test`.`t1` where (trim(leading _latin1'y' from `test`.`t1`.`s`) > _latin1'ab')

EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(TRAILING 'y' FROM s) > 'ab';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

Warnings:

Note	1003	select `test`.`t1`.`s` AS `s` from `test`.`t1` where (trim(trailing _latin1'y' from `test`.`t1`.`s`) > _latin1'ab')

EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(BOTH 'y' FROM s) > 'ab';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

Warnings:

Note	1003	select `test`.`t1`.`s` AS `s` from `test`.`t1` where (trim(both _latin1'y' from `test`.`t1`.`s`) > _latin1'ab')

DROP TABLE t1;

End of 4.1 tests

create table t1 (d decimal default null);

insert into t1 values (null);

mysql-test/r/group_by.result

+25 −0
Original line number Diff line number Diff line
@@ -796,3 +796,28 @@ aaa 
show warnings;

Level	Code	Message

drop table t1, t2;

CREATE TABLE t1 (a tinyint(3), b varchar(255), PRIMARY KEY  (a));

INSERT INTO t1 VALUES (1,'-----'), (6,'Allemagne'), (17,'Autriche'), 

(25,'Belgique'), (54,'Danemark'), (62,'Espagne'), (68,'France');

CREATE TABLE t2 (a tinyint(3), b tinyint(3), PRIMARY KEY  (a), KEY b (b));

INSERT INTO t2 VALUES (1,1), (2,1), (6,6), (18,17), (15,25), (16,25),

(17,25), (10,54), (5,62),(3,68);

CREATE VIEW v1 AS select t1.a, concat(t1.b,'') AS b, t1.b as real_b from t1;

explain 

SELECT straight_join sql_no_cache v1.a, v1.b, v1.real_b from t2, v1

where t2.b=v1.a GROUP BY t2.b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t2	index	b	b	2	NULL	10	Using index

1	PRIMARY	t1	eq_ref	PRIMARY	PRIMARY	1	test.t2.b	1	

SELECT straight_join sql_no_cache v1.a, v1.b, v1.real_b from t2, v1

where t2.b=v1.a GROUP BY t2.b;

a	b	real_b

1	-----	-----

6	Allemagne	Allemagne

17	Autriche	Autriche

25	Belgique	Belgique

54	Danemark	Danemark

62	Espagne	Espagne

68	France	France

DROP VIEW v1;

DROP TABLE t1,t2;