Commit db1a94a7 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-opt 

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


sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 4c8e0e19 58e178c5

mysql-test/r/sp.result

+63 −0
Original line number Diff line number Diff line
@@ -5394,4 +5394,67 @@ Procedure sql_mode Create Procedure 
bug21416		CREATE DEFINER=`root`@`localhost` PROCEDURE `bug21416`()

show create procedure bug21416

drop procedure bug21416|

CREATE TABLE t3 (

Member_ID varchar(15) NOT NULL,

PRIMARY KEY (Member_ID)

)|

CREATE TABLE t4 (

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 t3(Member_ID) VALUES

('111111'), ('222222'), ('333333'), ('444444'), ('555555'), ('666666')|

INSERT INTO t4(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' )|

DROP FUNCTION IF EXISTS bug21493|

Warnings:

Note	1305	FUNCTION bug21493 does not exist

CREATE FUNCTION bug21493(paramMember VARCHAR(15)) RETURNS varchar(45)

BEGIN

DECLARE tracks VARCHAR(45);

SELECT GROUP_CONCAT(Track SEPARATOR ', ') INTO tracks FROM t4

WHERE Member_ID=paramMember AND Action='Enrolled' AND 

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

WHERE Member_ID=paramMember GROUP BY Track);

RETURN tracks;

END|

SELECT bug21493('111111')|

bug21493('111111')

NULL

SELECT bug21493('222222')|

bug21493('222222')

CAD

SELECT bug21493(Member_ID) FROM t3|

bug21493(Member_ID)

NULL

CAD

CAD

CAD

CAD

CHF

DROP FUNCTION bug21493|

DROP TABLE t3,t4|

drop table t1,t2;

mysql-test/t/sp.test

+67 −0
Original line number Diff line number Diff line
@@ -6322,6 +6322,73 @@ create procedure bug21416() show create procedure bug21416| 
call bug21416()|

drop procedure bug21416|



#

# BUG#21493: Crash on the second call of a procedure containing

#            a select statement that uses an IN aggregating subquery  

#



CREATE TABLE t3 (

  Member_ID varchar(15) NOT NULL,

  PRIMARY KEY (Member_ID)

)|



CREATE TABLE t4 (

  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 t3(Member_ID) VALUES

  ('111111'), ('222222'), ('333333'), ('444444'), ('555555'), ('666666')|



INSERT INTO t4(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' )|



#--disable_warnings

DROP FUNCTION IF EXISTS bug21493|

#--enable_warnings



CREATE FUNCTION bug21493(paramMember VARCHAR(15)) RETURNS varchar(45)

BEGIN

DECLARE tracks VARCHAR(45);

SELECT GROUP_CONCAT(Track SEPARATOR ', ') INTO tracks FROM t4

  WHERE Member_ID=paramMember AND Action='Enrolled' AND 

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

                                  WHERE Member_ID=paramMember GROUP BY Track);

RETURN tracks;

END|



SELECT bug21493('111111')|

SELECT bug21493('222222')|



SELECT bug21493(Member_ID) FROM t3|



DROP FUNCTION bug21493|

DROP TABLE t3,t4|



#

# BUG#NNNN: New bug synopsis

#

sql/sql_delete.cc

+2 −1
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, 
*/

bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds)

{

  Item *fake_conds= 0;

  SELECT_LEX *select_lex= &thd->lex->select_lex;

  DBUG_ENTER("mysql_prepare_delete");
@@ -367,7 +368,7 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) 
      DBUG_RETURN(TRUE);

    }

  }

  select_lex->fix_prepare_information(thd, conds);

  select_lex->fix_prepare_information(thd, conds, &fake_conds);

  DBUG_RETURN(FALSE);

}

sql/sql_insert.cc

+1 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, 
      update_non_unique_table_error(table_list, "INSERT", duplicate);

      DBUG_RETURN(TRUE);

    }

    select_lex->fix_prepare_information(thd, &fake_conds);

    select_lex->fix_prepare_information(thd, &fake_conds, &fake_conds);

    select_lex->first_execution= 0;

  }

  if (duplic == DUP_UPDATE || duplic == DUP_REPLACE)

sql/sql_lex.cc

+19 −4
Original line number Diff line number Diff line
@@ -2158,15 +2158,25 @@ static void fix_prepare_info_in_table_list(THD *thd, TABLE_LIST *tbl) 




/*

  fix some structures at the end of preparation

  Save WHERE/HAVING/ON clauses and replace them with disposable copies



  SYNOPSIS

    st_select_lex::fix_prepare_information

      thd          thread handler

    conds pointer on conditions which will be used for execution statement

      conds        in/out pointer to WHERE condition to be met at execution

      having_conds in/out pointer to HAVING condition to be met at execution

  

  DESCRIPTION

    The passed WHERE and HAVING are to be saved for the future executions.

    This function saves it, and returns a copy which can be thrashed during

    this execution of the statement. By saving/thrashing here we mean only

    AND/OR trees.

    The function also calls fix_prepare_info_in_table_list that saves all

    ON expressions.    

*/



void st_select_lex::fix_prepare_information(THD *thd, Item **conds)

void st_select_lex::fix_prepare_information(THD *thd, Item **conds, 

                                            Item **having_conds)

{

  if (!thd->stmt_arena->is_conventional() && first_execution)

  {
@@ -2176,6 +2186,11 @@ void st_select_lex::fix_prepare_information(THD *thd, Item **conds) 
      prep_where= *conds;

      *conds= where= prep_where->copy_andor_structure(thd);

    }

    if (*having_conds)

    {

      prep_having= *having_conds;

      *having_conds= having= prep_having->copy_andor_structure(thd);

    }

    fix_prepare_info_in_table_list(thd, (TABLE_LIST *)table_list.first);

  }

}