Commit 126375b1 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.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Use local.
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.
parents 66b53b16 4ec84721

mysql-test/lib/mtr_im.pl

+2 −2
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ sub mtr_im_start($$) { 
    mtr_add_arg($args, $opt);

  }



  $im->{'pid'} =

  $im->{'spawner_pid'} =

    mtr_spawn(

      $::exe_im,                        # path to the executable

      $args,                            # cmd-line args
@@ -593,7 +593,7 @@ sub mtr_im_start($$) { 
      { append_log_file => 1 }          # append log files

      );



  unless ( $im->{'pid'} )

  unless ( $im->{'spawner_pid'} )

  {

    mtr_error('Could not start Instance Manager.')

  }

mysql-test/lib/mtr_io.pl

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ sub mtr_get_pid_from_file ($) { 


    # Read pid number from file

    my $pid= <FILE>;

    chomp $pid;

    close FILE;



    return $pid if $pid=~ /^(\d+)/;

mysql-test/r/im_daemon_life_cycle.result

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ instance_name state 
mysqld1	XXXXX

mysqld2	offline

Killing the process...

Sleeping...

Waiting...

Success: the process was restarted.

Success: server is ready to accept connection on socket.
@@ -16,7 +16,7 @@ Success: server is ready to accept connection on socket. 
START INSTANCE mysqld2;

Success: the process has been started.

Killing the process...

Sleeping...

Waiting...

Success: the process was restarted.

Success: server is ready to accept connection on socket.

SHOW INSTANCE STATUS mysqld1;

mysql-test/r/im_life_cycle.result

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ ERROR HY000: Unknown instance name 
-- 1.1.6.

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

Killing the process...

Sleeping...

Waiting...

Success: the process was restarted.

SHOW INSTANCES;

instance_name	state
@@ -52,7 +52,7 @@ mysqld2 offline 
START INSTANCE mysqld2;

Success: the process has been started.

Killing the process...

Sleeping...

Waiting...

Success: the process was killed.



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

mysql-test/r/rpl_trigger.result

+27 −0
Original line number Diff line number Diff line
@@ -944,3 +944,30 @@ c 
---> Cleaning up...

DROP TABLE t1;

DROP TABLE t2;

drop table if exists t1;

create table t1(a int, b varchar(50));

drop trigger not_a_trigger;

ERROR HY000: Trigger does not exist

drop trigger if exists not_a_trigger;

Warnings:

Note	1360	Trigger does not exist

create trigger t1_bi before insert on t1

for each row set NEW.b := "In trigger t1_bi";

insert into t1 values (1, "a");

drop trigger if exists t1_bi;

insert into t1 values (2, "b");

drop trigger if exists t1_bi;

Warnings:

Note	1360	Trigger does not exist

insert into t1 values (3, "c");

select * from t1;

a	b

1	In trigger t1_bi

2	b

3	c

select * from t1;

a	b

1	In trigger t1_bi

2	b

3	c

drop table t1;