Commit d946b64d authored by unknown's avatar unknown
Browse files

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 

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


mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/guardian.h:
  Auto merged
server-tools/instance-manager/instance_map.cc:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/sp-error.result:
  Use local
mysql-test/r/sp.result:
  Use local
  (will overwrite)
mysql-test/t/view.test:
  Use local.
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/t/sp-error.test:
  Manual merge.
server-tools/instance-manager/instance.cc:
  Manual merge.
server-tools/instance-manager/manager.cc:
  Manual merge.
server-tools/instance-manager/options.cc:
  Manual merge.
server-tools/instance-manager/options.h:
  Manual merge.
sql/log_event.cc:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/sql_class.h:
  Manual merge.
sql/sql_insert.cc:
  Manual merge.
sql/sql_load.cc:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
parents efcd6b42 8db4dc3f

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

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/sp-vars.result

+23 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ DROP FUNCTION IF EXISTS sp_vars_check_ret1; 
DROP FUNCTION IF EXISTS sp_vars_check_ret2;

DROP FUNCTION IF EXISTS sp_vars_check_ret3;

DROP FUNCTION IF EXISTS sp_vars_check_ret4;

DROP FUNCTION IF EXISTS sp_vars_div_zero;

SET @@sql_mode = 'ansi';

CREATE PROCEDURE sp_vars_check_dflt()

BEGIN
@@ -88,6 +89,12 @@ CREATE FUNCTION sp_vars_check_ret4() RETURNS DECIMAL(64, 2) 
BEGIN

RETURN 12 * 10 + 34 + 0.1234;

END|

CREATE FUNCTION sp_vars_div_zero() RETURNS INTEGER

BEGIN

DECLARE div_zero INTEGER;

SELECT 1/0 INTO div_zero;

RETURN div_zero;

END|



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

Calling the routines, created in ANSI mode.
@@ -172,6 +179,9 @@ sp_vars_check_ret4() 
154.12

Warnings:

Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 1

SELECT sp_vars_div_zero();

sp_vars_div_zero()

NULL

SET @@sql_mode = 'traditional';



---------------------------------------------------------------
@@ -257,12 +267,16 @@ sp_vars_check_ret4() 
154.12

Warnings:

Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 1

SELECT sp_vars_div_zero();

sp_vars_div_zero()

NULL

DROP PROCEDURE sp_vars_check_dflt;

DROP PROCEDURE sp_vars_check_assignment;

DROP FUNCTION sp_vars_check_ret1;

DROP FUNCTION sp_vars_check_ret2;

DROP FUNCTION sp_vars_check_ret3;

DROP FUNCTION sp_vars_check_ret4;

DROP FUNCTION sp_vars_div_zero;

CREATE PROCEDURE sp_vars_check_dflt()

BEGIN

DECLARE v1 TINYINT DEFAULT 1e200;
@@ -346,6 +360,12 @@ CREATE FUNCTION sp_vars_check_ret4() RETURNS DECIMAL(64, 2) 
BEGIN

RETURN 12 * 10 + 34 + 0.1234;

END|

CREATE FUNCTION sp_vars_div_zero() RETURNS INTEGER

BEGIN

DECLARE div_zero INTEGER;

SELECT 1/0 INTO div_zero;

RETURN div_zero;

END|



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

Calling the routines, created in TRADITIONAL mode.
@@ -366,6 +386,8 @@ sp_vars_check_ret4() 
154.12

Warnings:

Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 1

SELECT sp_vars_div_zero();

ERROR 22012: Division by 0

SET @@sql_mode = 'ansi';

DROP PROCEDURE sp_vars_check_dflt;

DROP PROCEDURE sp_vars_check_assignment;
@@ -373,6 +395,7 @@ DROP FUNCTION sp_vars_check_ret1; 
DROP FUNCTION sp_vars_check_ret2;

DROP FUNCTION sp_vars_check_ret3;

DROP FUNCTION sp_vars_check_ret4;

DROP FUNCTION sp_vars_div_zero;



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

BIT data type tests

mysql-test/r/trigger.result

+60 −4
Original line number Diff line number Diff line
@@ -1073,10 +1073,11 @@ SELECT @x; 
NULL

SET @x=2;

UPDATE t1 SET i1 = @x;

ERROR 22012: Division by 0

Warnings:

Error	1365	Division by 0

SELECT @x;

@x

2

NULL

SET SQL_MODE='';

SET @x=3;

INSERT INTO t1 VALUES (@x);
@@ -1085,10 +1086,12 @@ SELECT @x; 
NULL

SET @x=4;

UPDATE t1 SET i1 = @x;

ERROR 22012: Division by 0

Warnings:

Error	1365	Division by 0

Error	1365	Division by 0

SELECT @x;

@x

4

NULL

SET @@sql_mode=@save_sql_mode;

DROP TRIGGER t1_ai;

DROP TRIGGER t1_au;
@@ -1174,6 +1177,59 @@ ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghi 
DROP TABLE t1;

DROP TABLE t2;

drop table if exists t1;

drop table if exists t2;

drop table if exists t3;

drop table if exists t4;

SET @save_sql_mode=@@sql_mode;

SET sql_mode='TRADITIONAL'|

create table t1 (id int(10) not null primary key, v int(10) )|

create table t2 (id int(10) not null primary key, v int(10) )|

create table t3 (id int(10) not null primary key, v int(10) )|

create table t4 (c int)|

create trigger t4_bi before insert on t4 for each row set @t4_bi_called:=1|

create trigger t4_bu before update on t4 for each row set @t4_bu_called:=1|

insert into t1 values(10, 10)|

set @a:=1/0|

Warnings:

Error	1365	Division by 0

select 1/0 from t1|

1/0

NULL

Warnings:

Error	1365	Division by 0

create trigger t1_bi before insert on t1 for each row set @a:=1/0|

insert into t1 values(20, 20)|

Warnings:

Error	1365	Division by 0

drop trigger t1_bi|

create trigger t1_bi before insert on t1 for each row

begin

insert into t2 values (new.id, new.v);

update t2 set v=v+1 where id= new.id;

replace t3 values (new.id, 0);

update t2, t3 set t2.v=new.v, t3.v=new.v where t2.id=t3.id;

create temporary table t5 select * from t1;

delete from t5;

insert into t5 select * from t1;

insert into t4 values (0);

set @check= (select count(*) from t5);

update t4 set c= @check;

drop temporary table t5;

set @a:=1/0;

end|

set @check=0, @t4_bi_called=0, @t4_bu_called=0|

insert into t1 values(30, 30)|

Warnings:

Error	1365	Division by 0

select @check, @t4_bi_called, @t4_bu_called|

@check	@t4_bi_called	@t4_bu_called

2	1	1

SET @@sql_mode=@save_sql_mode;

drop table t1;

drop table t2;

drop table t3;

drop table t4;

drop table if exists t1;

create table t1 (i int, j int key);

insert into t1 values (1,1), (2,2), (3,3);

create trigger t1_bu before update on t1 for each row