Commit f849da24 authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/50 

into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge (use local)
mysql-test/t/ctype_utf8.test:
  Manual merge (use local)
mysql-test/r/ps.result:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/unireg.cc:
  Manual merge
parents d678c613 c681d06f

mysql-test/r/ctype_ucs.result

+21 −0
Original line number Diff line number Diff line
@@ -755,6 +755,27 @@ select export_set(5, name, upper(name), ",", 5) from bug20536; 
export_set(5, name, upper(name), ",", 5)

test1,TEST1,test1,TEST1,TEST1

'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'

CREATE TABLE t1 (

status enum('active','passive') collate latin1_general_ci 

NOT NULL default 'passive'

);

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `status` enum('active','passive') character set latin1 collate latin1_general_ci NOT NULL default 'passive'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t1 ADD a int NOT NULL AFTER status;

CREATE TABLE t2 (

status enum('active','passive') collate ucs2_turkish_ci 

NOT NULL default 'passive'

);

SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `status` enum('active','passive') character set ucs2 collate ucs2_turkish_ci NOT NULL default 'passive'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t2 ADD a int NOT NULL AFTER status;

DROP TABLE t1,t2;

select password(name) from bug20536;

password(name)

????????????????????

mysql-test/r/func_gconcat.result

+9 −0
Original line number Diff line number Diff line
@@ -660,3 +660,12 @@ CHAR_LENGTH( GROUP_CONCAT(b) ) 
240001

SET GROUP_CONCAT_MAX_LEN = 1024;

DROP TABLE t1;

CREATE TABLE t1 (a int, b int);

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

SELECT GROUP_CONCAT(a), x 

FROM (SELECT a, GROUP_CONCAT(b) x FROM t1 GROUP BY a) AS s

GROUP BY x;

GROUP_CONCAT(a)	x

2	1,2

1	2,3

DROP TABLE t1;

mysql-test/r/func_group.result

+2 −2
Original line number Diff line number Diff line
@@ -851,8 +851,8 @@ CREATE TABLE t1 (a INT, b INT); 
INSERT INTO t1 VALUES (1,1),(1,2),(2,3);

SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;

(SELECT COUNT(DISTINCT t1.b))

0

2

1

SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;

(SELECT COUNT(DISTINCT 12))

1
@@ -1004,7 +1004,7 @@ SELECT SQL_NO_CACHE 
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

1

DROP TABLE t1,t2;

create table t1 select variance(0);

show create table t1;

mysql-test/r/group_by.result

+0 −9
Original line number Diff line number Diff line
@@ -821,12 +821,3 @@ a b real_b 
68	France	France

DROP VIEW v1;

DROP TABLE t1,t2;
 
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;

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;

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;

mysql-test/r/ps.result

+48 −0
Original line number Diff line number Diff line
@@ -499,6 +499,54 @@ create temporary table if not exists t1 (a1 int); 
execute stmt;

drop temporary table t1;

deallocate prepare stmt;

CREATE TABLE t1(

ID int(10) unsigned NOT NULL auto_increment,

Member_ID varchar(15) NOT NULL default '',

Action varchar(12) NOT NULL,

Action_Date datetime NOT NULL,

Track varchar(15) default NULL,

User varchar(12) default NULL,

Date_Updated timestamp NOT NULL default CURRENT_TIMESTAMP on update

CURRENT_TIMESTAMP,

PRIMARY KEY (ID),

KEY Action (Action),

KEY Action_Date (Action_Date)

);

INSERT INTO t1(Member_ID, Action, Action_Date, Track) VALUES

('111111', 'Disenrolled', '2006-03-01', 'CAD' ),

('111111', 'Enrolled', '2006-03-01', 'CAD' ),

('111111', 'Disenrolled', '2006-07-03', 'CAD' ),

('222222', 'Enrolled', '2006-03-07', 'CAD' ),

('222222', 'Enrolled', '2006-03-07', 'CHF' ),

('222222', 'Disenrolled', '2006-08-02', 'CHF' ),

('333333', 'Enrolled', '2006-03-01', 'CAD' ),

('333333', 'Disenrolled', '2006-03-01', 'CAD' ),

('444444', 'Enrolled', '2006-03-01', 'CAD' ),

('555555', 'Disenrolled', '2006-03-01', 'CAD' ),

('555555', 'Enrolled', '2006-07-21', 'CAD' ),

('555555', 'Disenrolled', '2006-03-01', 'CHF' ),

('666666', 'Enrolled', '2006-02-09', 'CAD' ),

('666666', 'Enrolled', '2006-05-12', 'CHF' ),

('666666', 'Disenrolled', '2006-06-01', 'CAD' );

PREPARE STMT FROM

"SELECT GROUP_CONCAT(Track SEPARATOR ', ') FROM t1

  WHERE Member_ID=? AND Action='Enrolled' AND

        (Track,Action_Date) IN (SELECT Track, MAX(Action_Date) FROM t1

                                  WHERE Member_ID=?

                                    GROUP BY Track 

                                      HAVING Track>='CAD' AND

                                             MAX(Action_Date)>'2006-03-01')";

SET @id='111111';

EXECUTE STMT USING @id,@id;

GROUP_CONCAT(Track SEPARATOR ', ')

NULL

SET @id='222222';

EXECUTE STMT USING @id,@id;

GROUP_CONCAT(Track SEPARATOR ', ')

CAD

DEALLOCATE PREPARE STMT;

DROP TABLE t1;

End of 4.1 tests

create table t1 (a varchar(20));

insert into t1 values ('foo');

prepare stmt FROM 'SELECT char_length (a) FROM t1';