Commit f20d34f4 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 4ae5ba2d e1e0f829

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

+27 −0
Original line number Diff line number Diff line
@@ -5470,5 +5470,32 @@ CAD 
CHF

DROP FUNCTION bug21493|

DROP TABLE t3,t4|

drop procedure if exists proc_21462_a|

drop procedure if exists proc_21462_b|

create procedure proc_21462_a()

begin

select "Called A";

end|

create procedure proc_21462_b(x int)

begin

select "Called B";

end|

call proc_21462_a|

Called A

Called A

call proc_21462_a()|

Called A

Called A

call proc_21462_a(1)|

ERROR 42000: Incorrect number of arguments for PROCEDURE test.proc_21462_a; expected 0, got 1

call proc_21462_b|

ERROR 42000: Incorrect number of arguments for PROCEDURE test.proc_21462_b; expected 1, got 0

call proc_21462_b()|

ERROR 42000: Incorrect number of arguments for PROCEDURE test.proc_21462_b; expected 1, got 0

call proc_21462_b(1)|

Called B

Called B

drop procedure proc_21462_a|

drop procedure proc_21462_b|

End of 5.0 tests

drop table t1,t2;

mysql-test/t/im_daemon_life_cycle.imtest

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 


###########################################################################



# Wait for IM to start accepting connections.



--exec $MYSQL_TEST_DIR/t/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 30



###########################################################################



#

# BUG#12751: Instance Manager: client hangs

#

mysql-test/t/sp.test

+33 −0
Original line number Diff line number Diff line
@@ -6420,6 +6420,39 @@ SELECT bug21493(Member_ID) FROM t3| 
DROP FUNCTION bug21493|

DROP TABLE t3,t4|



#

# Bug#21462 Stored procedures with no arguments require parenthesis

#



--disable_warnings

drop procedure if exists proc_21462_a|

drop procedure if exists proc_21462_b|

--enable_warnings



create procedure proc_21462_a()

begin

  select "Called A";

end|



create procedure proc_21462_b(x int)

begin

  select "Called B";

end|



call proc_21462_a|

call proc_21462_a()|

-- error ER_SP_WRONG_NO_OF_ARGS

call proc_21462_a(1)|



-- error ER_SP_WRONG_NO_OF_ARGS

call proc_21462_b|

-- error ER_SP_WRONG_NO_OF_ARGS

call proc_21462_b()|

call proc_21462_b(1)|



drop procedure proc_21462_a|

drop procedure proc_21462_b|



--echo End of 5.0 tests