Commit b8fe6206 authored by unknown's avatar unknown
Browse files

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

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


sql/sql_select.cc:
  Auto merged
parents abd883f4 2b59a97b

myisam/mi_check.c

+10 −4
Original line number Diff line number Diff line
@@ -1153,9 +1153,12 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend) 
	      /* We don't need to lock the key tree here as we don't allow

		 concurrent threads when running myisamchk

	      */

              int search_result= (keyinfo->flag & HA_SPATIAL) ?

              int search_result=

#ifdef HAVE_RTREE_KEYS

                (keyinfo->flag & HA_SPATIAL) ?

                rtree_find_first(info, key, info->lastkey, key_length,

                                 MBR_EQUAL | MBR_DATA) : 

#endif

                _mi_search(info,keyinfo,info->lastkey,key_length,

                           SEARCH_SAME, info->s->state.key_root[key]);

              if (search_result)
@@ -1366,7 +1369,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;
@@ -2063,7 +2067,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)
@@ -2431,7 +2436,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
@@ -747,6 +747,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/ps.result

+47 −0
Original line number Diff line number Diff line
@@ -889,3 +889,50 @@ 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;

mysql-test/r/subselect.result

+36 −0
Original line number Diff line number Diff line
@@ -2946,3 +2946,39 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; 
a	a	b

10	1	359

drop table t1,t2;

CREATE TABLE t1 (                  

field1 int NOT NULL,                 

field2 int NOT NULL,                 

field3 int NOT NULL,                 

PRIMARY KEY  (field1,field2,field3)  

);

CREATE TABLE t2 (             

fieldA int NOT NULL,            

fieldB int NOT NULL,            

PRIMARY KEY  (fieldA,fieldB)     

);

INSERT INTO t1 VALUES

(1,1,1), (1,1,2), (1,2,1), (1,2,2), (1,2,3), (1,3,1);

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

SELECT field1, field2, COUNT(*)

FROM t1 GROUP BY field1, field2;

field1	field2	COUNT(*)

1	1	2

1	2	3

1	3	1

SELECT field1, field2

FROM  t1

GROUP BY field1, field2

HAVING COUNT(*) >= ALL (SELECT fieldB 

FROM t2 WHERE fieldA = field1);

field1	field2

1	2

SELECT field1, field2

FROM  t1

GROUP BY field1, field2

HAVING COUNT(*) < ANY (SELECT fieldB 

FROM t2 WHERE fieldA = field1);

field1	field2

1	1

1	3

DROP TABLE t1, t2;

mysql-test/t/ctype_ucs.test

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

select export_set(5, name, upper(name), ",", 5) from bug20536;



#

# Bug #20108: corrupted default enum value for a ucs2 field              

#



CREATE TABLE t1 (

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

    NOT NULL default 'passive'

);

SHOW CREATE TABLE t1;

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;

ALTER TABLE t2 ADD a int NOT NULL AFTER status; 



DROP TABLE t1,t2;





# Some broken functions:  add these tests just to document current behavior.



# PASSWORD and OLD_PASSWORD don't work with UCS2 strings, but to fix it would