Commit 31a87fde authored by unknown's avatar unknown
Browse files

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

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


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.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
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
parents a1db0e72 8c6382f5

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

}

include/my_time.h

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ int my_TIME_to_str(const MYSQL_TIME *l_time, char *to); 
/*

  The following must be sorted so that simple intervals comes first.

  (get_interval_value() depends on this)

  When updating this enum please update 

  LEX_STRING interval_type_to_name[] in sql/time.cc

*/



enum interval_type

mysql-test/include/mix1.inc

+30 −0
Original line number Diff line number Diff line
@@ -259,6 +259,36 @@ select distinct a1 from t4 where pk_col not in (1,2,3,4); 


drop table t1,t4;





#

# BUG#18819: DELETE IGNORE hangs on foreign key parent delete

#

# The bug itself does not relate to InnoDB, but we have to use foreign

# keys to reproduce it.

#

--disable_warnings

DROP TABLE IF EXISTS t2, t1;

--enable_warnings



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;



SELECT * FROM t1, t2;



DROP TABLE t2, t1;





--echo End of 4.1 tests.





#

# Bug #6142: a problem with the empty innodb table

# (was part of group_min_max.test)

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

+10 −6
Original line number Diff line number Diff line
@@ -1425,6 +1425,7 @@ sub environment_setup () { 
# $ENV{'MYSQL_TCP_PORT'}=     '@MYSQL_TCP_PORT@'; # FIXME

  $ENV{'MYSQL_TCP_PORT'}=     3306;



  $ENV{'EXE_MYSQL'}=          $exe_mysql;

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



  # ----------------------------------------------------
@@ -1456,6 +1457,9 @@ sub environment_setup () { 
  $ENV{'IM_PORT'}=            $instance_manager->{port};

  $ENV{'IM_DEFAULTS_PATH'}=   $instance_manager->{defaults_file};

  $ENV{'IM_PASSWORD_PATH'}=   $instance_manager->{password_file};

  $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};