Commit 7589de6c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 

into  mysql.com:/home/hartmut/projects/mysql/dev/5.1


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
parents 040fc2d3 f7b039cc

mysql-test/r/ctype_ucs.result

+8 −0
Original line number Diff line number Diff line
@@ -719,3 +719,11 @@ lily 
river

drop table t1;

deallocate prepare stmt;

create table t1(a blob, b text charset utf8, c text charset ucs2);

select data_type, character_octet_length, character_maximum_length

from information_schema.columns where table_name='t1';

data_type	character_octet_length	character_maximum_length

blob	65535	65535

text	65535	65535

text	65535	32767

drop table t1;

mysql-test/r/func_gconcat.result

+5 −0
Original line number Diff line number Diff line
@@ -626,3 +626,8 @@ latin1 
latin1

drop table t1, t2, t3;

set names default;

create table t1 (c1 varchar(10), c2 int);

select charset(group_concat(c1 order by c2)) from t1;

charset(group_concat(c1 order by c2))

latin1

drop table t1;

mysql-test/r/func_time.result

+36 −0
Original line number Diff line number Diff line
@@ -360,6 +360,42 @@ extract(SECOND FROM "1999-01-02 10:11:12") 
select extract(MONTH FROM "2001-02-00");

extract(MONTH FROM "2001-02-00")

2

SELECT EXTRACT(QUARTER FROM '2004-01-15') AS quarter;

quarter

1

SELECT EXTRACT(QUARTER FROM '2004-02-15') AS quarter;

quarter

1

SELECT EXTRACT(QUARTER FROM '2004-03-15') AS quarter;

quarter

1

SELECT EXTRACT(QUARTER FROM '2004-04-15') AS quarter;

quarter

2

SELECT EXTRACT(QUARTER FROM '2004-05-15') AS quarter;

quarter

2

SELECT EXTRACT(QUARTER FROM '2004-06-15') AS quarter;

quarter

2

SELECT EXTRACT(QUARTER FROM '2004-07-15') AS quarter;

quarter

3

SELECT EXTRACT(QUARTER FROM '2004-08-15') AS quarter;

quarter

3

SELECT EXTRACT(QUARTER FROM '2004-09-15') AS quarter;

quarter

3

SELECT EXTRACT(QUARTER FROM '2004-10-15') AS quarter;

quarter

4

SELECT EXTRACT(QUARTER FROM '2004-11-15') AS quarter;

quarter

4

SELECT EXTRACT(QUARTER FROM '2004-12-15') AS quarter;

quarter

4

SELECT "1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND;

"1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND

1968-01-20 03:14:08

mysql-test/r/information_schema.result

+0 −8
Original line number Diff line number Diff line
@@ -1084,14 +1084,6 @@ select 1 from (select 1 from test.t1) a; 
1

use test;

drop table t1;

create table t1(a blob, b text charset utf8, c text charset ucs2);

select data_type, character_octet_length, character_maximum_length 

from information_schema.columns where table_name='t1';

data_type	character_octet_length	character_maximum_length

blob	65535	65535

text	65535	65535

text	65535	32767

drop table t1;

create table t1 (f1 int(11));

create view v1 as select * from t1;

drop table t1;

mysql-test/t/ctype_ucs.test

+8 −0
Original line number Diff line number Diff line
@@ -455,3 +455,11 @@ execute stmt using @param1; 
select utext from t1 where utext like '%%';

drop table t1;

deallocate prepare stmt;



#

# Bug #14290: character_maximum_length for text fields

#

create table t1(a blob, b text charset utf8, c text charset ucs2);

select data_type, character_octet_length, character_maximum_length

  from information_schema.columns where table_name='t1';

drop table t1;