Commit 70255e85 authored by unknown's avatar unknown
Browse files

Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents c316933e ca5e2947

myisam/mi_check.c

+6 −3
Original line number Diff line number Diff line
@@ -1370,7 +1370,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param,new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param,new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    info->s->state.dellink= HA_OFFSET_ERROR;
@@ -2072,7 +2073,8 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param, new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param, new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    if (param->testflag & T_UNPACK)
@@ -2440,7 +2442,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param, new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param, new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    if (param->testflag & T_UNPACK)

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
@@ -654,3 +654,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
@@ -860,8 +860,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
@@ -1013,7 +1013,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;