Commit cf6ec104 authored by unknown's avatar unknown
Browse files

Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty 

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Manual merged.
server-tools/instance-manager/instance.cc:
  Manual merged.
server-tools/instance-manager/mysql_connection.cc:
  Manual merged.
parents a316aebc 71936a11

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/parser_bug21114.inc

0 → 100755
+59 −0
Original line number Diff line number Diff line 
#

# Bug#21114 (Foreign key creation fails to table with name format)

#

# Trying to trick the parser into thinking $FCT(...) is a function call,

# which is not in the CREATE TABLE and FOREIGN KEY ... REFERENCES syntax

#

# Usage :

#

# let $engine_type=InnoDb;

# let $verbose=1;

# let $FCT= <value_1>;

# -- source parser_stress_func.inc

# let $FCT= <value_2>;

# -- source parser_stress_func.inc

# let $verbose=0;

# let $FCT= <value_3>;

# -- source parser_stress_func.inc

# let $FCT= <value_4>;

# -- source parser_stress_func.inc



-- disable_warnings

eval drop table if exists $FCT;

drop table if exists bug21114_child;

-- enable_warnings



--disable_query_log

--disable_result_log



eval CREATE TABLE $FCT(

  col1 int not null,

  col2 int not null,

  col3 varchar(10),

  CONSTRAINT pk PRIMARY KEY (col1, col2)

) ENGINE $engine_type;



eval CREATE TABLE bug21114_child(

  pk int not null,

  fk_col1 int not null,

  fk_col2 int not null,

  fk_col3 int not null,

  fk_col4 int not null,

  CONSTRAINT fk_fct FOREIGN KEY (fk_col1, fk_col2)

    REFERENCES $FCT(col1, col2),

  CONSTRAINT fk_fct_space FOREIGN KEY (fk_col3, fk_col4)

    REFERENCES $FCT (col1, col2)

) ENGINE $engine_type;



--enable_query_log

--enable_result_log



if ($verbose)

{

  eval SHOW CREATE TABLE $FCT;

  SHOW CREATE TABLE bug21114_child;

}



DROP TABLE bug21114_child;

eval DROP TABLE $FCT;

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