Commit 5d1f0164 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
parents 0c9fc6ba b7a4d782

include/hash.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ my_bool hash_check(HASH *hash); /* Only in debug library */ 


#define hash_clear(H) bzero((char*) (H),sizeof(*(H)))

#define hash_inited(H) ((H)->array.buffer != 0)

#define hash_init_opt(A,B,C,D,E,F,G,H) \

          (!hash_inited(A) && _hash_init(A,B,C,D,E,F,G, H CALLER_INFO))



#ifdef	__cplusplus

}

mysql-test/include/sp-vars.inc

+9 −0
Original line number Diff line number Diff line
@@ -119,4 +119,13 @@ END| 


---------------------------------------------------------------------------



CREATE FUNCTION sp_vars_div_zero() RETURNS INTEGER

BEGIN

  DECLARE div_zero INTEGER;

  SELECT 1/0 INTO div_zero;

  RETURN div_zero;

END|



---------------------------------------------------------------------------



delimiter ;|

mysql-test/mysql-test-run.pl

+6 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,9 @@ sub environment_setup () { 
  $ENV{'IM_PATH_PID'}=        $instance_manager->{path_pid};

  $ENV{'IM_PATH_ANGEL_PID'}=  $instance_manager->{path_angel_pid};

  $ENV{'IM_PORT'}=            $instance_manager->{port};

  $ENV{'IM_PATH_SOCK'}=       $instance_manager->{path_sock};

  $ENV{'IM_USERNAME'}=        $instance_manager->{admin_login};

  $ENV{'IM_PASSWORD'}=        $instance_manager->{admin_password};



  $ENV{'IM_MYSQLD1_SOCK'}=    $instance_manager->{instances}->[0]->{path_sock};

  $ENV{'IM_MYSQLD1_PORT'}=    $instance_manager->{instances}->[0]->{port};
@@ -1276,6 +1279,9 @@ sub environment_setup () { 
  $ENV{'IM_MYSQLD2_PORT'}=    $instance_manager->{instances}->[1]->{port};

  $ENV{'IM_MYSQLD2_PATH_PID'}=$instance_manager->{instances}->[1]->{path_pid};



  $ENV{'EXE_MYSQL'}=          $exe_mysql;





  $ENV{MTR_BUILD_THREAD}= 0 unless $ENV{MTR_BUILD_THREAD}; # Set if not set



  # We are nice and report a bit about our settings

mysql-test/r/im_daemon_life_cycle.result

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ mysqld2 offline 
Killing the process...

Sleeping...

Success: the process was restarted.

Success: server is ready to accept connection on socket.



--------------------------------------------------------------------

-- Test for BUG#12751

mysql-test/r/innodb_mysql.result

+16 −0
Original line number Diff line number Diff line
@@ -295,6 +295,22 @@ b 
c

d

drop table t1,t4;

DROP TABLE IF EXISTS t2, t1;

CREATE TABLE t1 (i INT NOT NULL PRIMARY KEY) ENGINE= InnoDB;

CREATE TABLE t2 (

i INT NOT NULL,

FOREIGN KEY (i) REFERENCES t1 (i) ON DELETE NO ACTION

) ENGINE= InnoDB;

INSERT INTO t1 VALUES (1);

INSERT INTO t2 VALUES (1);

DELETE IGNORE FROM t1 WHERE i = 1;

Warnings:

Error	1451	Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`i`) REFERENCES `t1` (`i`) ON DELETE NO ACTION)

SELECT * FROM t1, t2;

i	i

1	1

DROP TABLE t2, t1;

End of 4.1 tests.

create table t1 (

a varchar(30), b varchar(30), primary key(a), key(b)

) engine=innodb;