Commit cae189b1 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1


mysql-test/t/multi_update.test:
  Auto merged
parents a8341f1b c8cfe3d2

client/mysqltest.c

+3 −1
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ static void free_used_memory() 
  mysql_server_end();

  if (ps_protocol)

    ps_free_reg();

  my_end(MY_CHECK_ERROR);

  DBUG_VOID_RETURN;

}
@@ -556,6 +555,7 @@ static void die(const char* fmt, ...) 
  }

  va_end(args);

  free_used_memory();

  my_end(MY_CHECK_ERROR);

  exit(1);

}
@@ -568,6 +568,7 @@ static void abort_not_supported_test() 
  if (!silent)

    printf("skipped\n");

  free_used_memory();

  my_end(MY_CHECK_ERROR);

  exit(2);

}
@@ -3655,6 +3656,7 @@ int main(int argc, char **argv) 
  if (!got_end_timer)

    timer_output();				/* No end_timer cmd, end it */

  free_used_memory();

  my_end(MY_CHECK_ERROR);

  exit(error ? 1 : 0);

  return error ? 1 : 0;				/* Keep compiler happy */

  }

mysql-test/lib/mtr_process.pl

+204 −158
Original line number Diff line number Diff line
@@ -4,13 +4,14 @@ 
# and is part of the translation of the Bourne shell script with the

# same name.



use Carp qw(cluck);

use strict;



use POSIX ":sys_wait_h";



sub mtr_run ($$$$$$);

sub mtr_spawn ($$$$$$);

sub mtr_stop_servers ($);

sub mtr_stop_mysqld_servers ($$);

sub mtr_kill_leftovers ();



# static in C
@@ -77,13 +78,21 @@ sub spawn_impl ($$$$$$$) { 


  if ( $::opt_script_debug )

  {

    print STDERR "-" x 78, "\n";

    print STDERR "STDIN  $input\n" if $input;

    print STDERR "STDOUT $output\n" if $output;

    print STDERR "STDERR $error\n" if $error;

    print STDERR "DAEMON\n" if !$join;

    print STDERR "EXEC $path ", join(" ",@$arg_list_t), "\n";

    print STDERR "-" x 78, "\n";

    print STDERR "\n";

    print STDERR "#### ", "-" x 78, "\n";

    print STDERR "#### ", "STDIN  $input\n" if $input;

    print STDERR "#### ", "STDOUT $output\n" if $output;

    print STDERR "#### ", "STDERR $error\n" if $error;

    if ( $join )

    {

      print STDERR "#### ", "run";

    }

    else

    {

      print STDERR "#### ", "spawn";

    }

    print STDERR "$path ", join(" ",@$arg_list_t), "\n";

    print STDERR "#### ", "-" x 78, "\n";

  }



  my $pid= fork();
@@ -101,11 +110,11 @@ sub spawn_impl ($$$$$$$) { 
      my $dumped_core= $? & 128;

      if ( $signal_num )

      {

        die("spawn got signal $signal_num");

        mtr_error("spawn got signal $signal_num");

      }

      if ( $dumped_core )

      {

        die("spawn dumped core");

        mtr_error("spawn dumped core");

      }

      return $exit_value;

    }
@@ -127,22 +136,34 @@ sub spawn_impl ($$$$$$$) { 


    if ( $output )

    {

      open(STDOUT,">",$output) or die "Can't redirect STDOUT to \"$output\": $!";

      if ( ! open(STDOUT,">",$output) )

      {

        mtr_error("can't redirect STDOUT to \"$output\": $!");

      }

    }

    if ( $error )

    {

      if ( $output eq $error )

      {

        open(STDERR,">&STDOUT") or die "Can't dup STDOUT: $!";

        if ( ! open(STDERR,">&STDOUT") )

        {

          mtr_error("can't dup STDOUT: $!");

        }

      }

      else

      {

        open(STDERR,">",$error) or die "Can't redirect STDERR to \"$output\": $!";

        if ( ! open(STDERR,">",$error) )

        {

          mtr_error("can't redirect STDERR to \"$output\": $!");

        }

      }

    }

    if ( $input )

    {

      open(STDIN,"<",$input) or die "Can't redirect STDIN to \"$input\": $!";

      if ( ! open(STDIN,"<",$input) )

      {

        mtr_error("can't redirect STDIN to \"$input\": $!");

      }

    }

    exec($path,@$arg_list_t);

  }
@@ -163,27 +184,25 @@ sub mtr_kill_leftovers () { 


  for ( my $idx; $idx < 2; $idx++ )

  {

#    if ( $::master->[$idx]->{'pid'} )

#    {

      push(@args,

           $::master->[$idx]->{'path_mypid'},

           $::master->[$idx]->{'path_mysock'},

         );

#    }

    push(@args,{

                pid      => 0,          # We don't know the PID

                pidfile  => $::master->[$idx]->{'path_mypid'},

                sockfile => $::master->[$idx]->{'path_mysock'},

                port     => $::master->[$idx]->{'path_myport'},

               });

  }



  for ( my $idx; $idx < 3; $idx++ )

  {

#    if ( $::slave->[$idx]->{'pid'} )

#    {

      push(@args,

           $::slave->[$idx]->{'path_mypid'},

           $::slave->[$idx]->{'path_mysock'},

         );

#    }

    push(@args,{

                pid       => 0,         # We don't know the PID

                pidfile   => $::slave->[$idx]->{'path_mypid'},

                sockfile  => $::slave->[$idx]->{'path_mysock'},

                port      => $::slave->[$idx]->{'path_myport'},

               });

  }



  mtr_stop_servers(\@args);

  mtr_stop_mysqld_servers(\@args, 1);



  # We scan the "var/run/" directory for other process id's to kill

  my $rundir= "$::glob_mysql_test_dir/var/run"; # FIXME $path_run_dir or something
@@ -211,6 +230,16 @@ sub mtr_kill_leftovers () { 
    }

    closedir(RUNDIR);



    start_reap_all();



    if ( $::glob_cygwin_perl )

    {

      # We have no (easy) way of knowing the Cygwin controlling

      # process, in the PID file we only have the Windows process id.

      system("kill -f " . join(" ",@pids)); # Hope for the best....

    }

    else

    {

      my $retries= 10;                    # 10 seconds

      do

      {
@@ -221,7 +250,9 @@ sub mtr_kill_leftovers () { 
      {

        mtr_error("can't kill processes " . join(" ", @pids));

      }

    }



    stop_reap_all();

  }

}
@@ -237,185 +268,200 @@ sub mtr_kill_leftovers () { 
# This is not perfect, there could still be other server processes

# left.



sub mtr_stop_servers ($) {

  my $spec= shift;



  # First try nice normal shutdown using 'mysqladmin'

# Force flag is to be set only for killing mysqld servers this script

# didn't create in this run, i.e. initial cleanup before we start working.

# If force flag is set, we try to kill all with mysqladmin, and

# give up if we have no PIDs.



  {

    my @args= @$spec;

    while ( @args )

    {

      my $pidfile=  shift @args;        # FIXME not used here....

      my $sockfile= shift @args;

# FIXME On some operating systems, $srv->{'pid'} and $srv->{'pidfile'}

#       will not be the same PID. We need to try to kill both I think.



      if ( -f $sockfile )

      {

sub mtr_stop_mysqld_servers ($$) {

  my $spec=  shift;

  my $force= shift;



        # FIXME wrong log.....

        # FIXME, stderr.....

        # Shutdown time must be high as slave may be in reconnect

        my $opts= 

          [

           "--no-defaults",

           "-uroot",

           "--socket=$sockfile",

           "--connect_timeout=5",

           "--shutdown_timeout=70",

           "shutdown",

         ];

        # We don't wait for termination of mysqladmin

        mtr_spawn($::exe_mysqladmin, $opts,

                  "", $::path_manager_log, $::path_manager_log, "");

      }

    }

  }

  # ----------------------------------------------------------------------

  # If the process was not started from this file, we got no PID,

  # we try to find it in the PID file.

  # ----------------------------------------------------------------------



  # Wait for them all to remove their socket file

  my $any_pid= 0;                     # If we have any PIDs



 SOCKREMOVED:

  for (my $loop= $::opt_sleep_time_for_delete; $loop; $loop--)

  {

    my $sockfiles_left= 0;

    my @args= @$spec;

    while ( @args )

  foreach my $srv ( @$spec )

  {

      my $pidfile=  shift @args;

      my $sockfile= shift @args;

      if ( -f $sockfile or -f $pidfile )

    if ( ! $srv->{'pid'} and -f $srv->{'pidfile'} )

    {

        $sockfiles_left++;              # Could be that pidfile is left

      }

      $srv->{'pid'}= mtr_get_pid_from_file($srv->{'pidfile'});

    }

    if ( ! $sockfiles_left )

    if ( $srv->{'pid'} )

    {

      last SOCKREMOVED;

      $any_pid= 1;

    }

    if ( $loop > 1 )

    {

      sleep(1);                 # One second

  }



  # If the processes where started from this script, and we know

  # no PIDs, then we don't have to do anything.



  if ( ! $any_pid and ! $force )

  {

    # cluck "This is how we got here!";

    return;

  }



  # We may have killed all that left a socket, but we are not sure we got

  # them all killed. We now check the PID file, if any

  # ----------------------------------------------------------------------

  # First try nice normal shutdown using 'mysqladmin'

  # ----------------------------------------------------------------------



  # Try nice kill with SIG_TERM

  start_reap_all();                   # Don't require waitpid() of children



  foreach my $srv ( @$spec )

  {

    my @args= @$spec;

    while ( @args )

    if ( -e $srv->{'sockfile'} or $srv->{'port'} )

    {

      my $pidfile=  shift @args;

      my $sockfile= shift @args;

      if (-f $pidfile)

      # FIXME wrong log.....

      # FIXME, stderr.....

      # Shutdown time must be high as slave may be in reconnect

      my $args;



      mtr_init_args(\$args);



      mtr_add_arg($args, "--no-defaults");

      mtr_add_arg($args, "-uroot");

      if ( -e $srv->{'sockfile'} )

      {

        my $pid= mtr_get_pid_from_file($pidfile);

        mtr_warning("process $pid not cooperating with mysqladmin, " .

                    "will send TERM signal to process");

        kill(15,$pid);          # SIG_TERM

        mtr_add_arg($args, "--socket=%s", $srv->{'sockfile'});

      }

      if ( $srv->{'port'} )

      {

        mtr_add_arg($args, "--port=%s", $srv->{'port'});

      }

      mtr_add_arg($args, "--connect_timeout=5");

      mtr_add_arg($args, "--shutdown_timeout=70");

      mtr_add_arg($args, "shutdown");

      # We don't wait for termination of mysqladmin

      mtr_spawn($::exe_mysqladmin, $args,

                "", $::path_manager_log, $::path_manager_log, "");

    }

  }



  # Wait for them all to die

  # Wait for them all to remove their pid and socket file



 PIDSOCKFILEREMOVED:

  for (my $loop= $::opt_sleep_time_for_delete; $loop; $loop--)

  {

    my $pidfiles_left= 0;

    my @args= @$spec;

    while ( @args )

    my $pidsockfiles_left= 0;

    foreach my $srv ( @$spec )

    {

      my $pidfile=  shift @args;

      my $sockfile= shift @args;

      if ( -f $pidfile )

      if ( -e $srv->{'sockfile'} or -f $srv->{'pidfile'} )

      {

        $pidfiles_left++;

        $pidsockfiles_left++;          # Could be that pidfile is left

      }

    }

    if ( ! $pidfiles_left )

    if ( ! $pidsockfiles_left )

    {

      return;

      last PIDSOCKFILEREMOVED;

    }

    if ( $loop > 1 )

    {

    mtr_debug("Sleep for 1 second waiting for pid and socket file removal");

    sleep(1);                          # One second

  }



  # ----------------------------------------------------------------------

  # If no known PIDs, we have nothing more to try

  # ----------------------------------------------------------------------



  if ( ! $any_pid )

  {

    stop_reap_all();

    return;

  }



  # Try hard kill with SIG_KILL

  # ----------------------------------------------------------------------

  # We may have killed all that left a socket, but we are not sure we got

  # them all killed. If we suspect it lives, try nice kill with SIG_TERM.

  # Note that for true Win32 processes, kill(0,$pid) will not return 1.

  # ----------------------------------------------------------------------



 SIGNAL:

  foreach my $sig (15,9)

  {

    my @args= @$spec;

    while ( @args )

    my $process_left= 0;

    foreach my $srv ( @$spec )

    {

      my $pidfile=  shift @args;

      my $sockfile= shift @args;

      if (-f $pidfile)

      if ( $srv->{'pid'} and

           ( -f $srv->{'pidfile'} or kill(0,$srv->{'pid'}) ) )

      {

        my $pid= mtr_get_pid_from_file($pidfile);

        mtr_warning("$pid did not die from TERM signal, ",

                    "will send KILL signal to process");

        kill(9,$pid);

        $process_left++;

        mtr_warning("process $srv->{'pid'} not cooperating, " .

                    "will send signal $sig to process");

        kill($sig,$srv->{'pid'});       # SIG_TERM

      }

      if ( ! $process_left )

      {

        last SIGNAL;

      }

    }

    mtr_debug("Sleep for 5 seconds waiting for processes to die");

    sleep(5);                           # We wait longer than usual

  }



  # We check with Perl "kill 0" if process still exists

  # ----------------------------------------------------------------------

  # Now, we check if all we can find using kill(0,$pid) are dead,

  # and just assume the rest are. We cleanup socket and PID files.

  # ----------------------------------------------------------------------



 PIDFILES:

  for (my $loop= $::opt_sleep_time_for_delete; $loop; $loop--)

  {

    my $not_terminated= 0;

    my @args= @$spec;

    while ( @args )

    my $errors= 0;

    foreach my $srv ( @$spec )

    {

      my $pidfile=  shift @args;

      my $sockfile= shift @args;

      if (-f $pidfile)

      if ( $srv->{'pid'} )

      {

        my $pid= mtr_get_pid_from_file($pidfile);

        if ( ! kill(0,$pid) )

        if ( kill(0,$srv->{'pid'}) )

        {

          $not_terminated++;

          mtr_warning("could't kill $pid");

          # FIXME In Cygwin there seem to be some fast reuse

          # of PIDs, so dying may not be the right thing to do.

          $errors++;

          mtr_warning("can't kill process $srv->{'pid'}");

        }

      }

    }

    if ( ! $not_terminated )

    {

      last PIDFILES;

    }

    if ( $loop > 1 )

        else

        {

      sleep(1);                 # One second

    }

  }

          # We managed to kill it at last

          # FIXME In Cygwin, we will get here even if the process lives.



          # Not needed as we know the process is dead, but to be safe

          # we unlink and check success in two steps. We first unlink

          # without checking the error code, and then check if the

          # file still exists.



          foreach my $file ($srv->{'pidfile'}, $srv->{'sockfile'})

          {

    my $pidfiles_left= 0;

    my @args= @$spec;

    while ( @args )

    {

      my $pidfile=  shift @args;

      my $sockfile= shift @args;

      if ( -f $pidfile )

      {

        if ( ! unlink($pidfile) )

            unlink($file);

            if ( -e $file )

            {

          $pidfiles_left++;

          mtr_warning("could't delete $pidfile");

              $errors++;

              mtr_warning("couldn't delete $file");

            }

          }

        }

      }

    if ( $pidfiles_left )

    }

    if ( $errors )

    {

      mtr_error("one or more pid files could not be deleted");

      # We are in trouble, just die....

      mtr_error("we could not kill or clean up all processes");

    }

  }



  stop_reap_all();



  # FIXME We just assume they are all dead, we don't know....

}



sub start_reap_all {

  $SIG{CHLD}= 'IGNORE';                 # FIXME is this enough?

}



sub stop_reap_all {

  $SIG{CHLD}= 'DEFAULT';

}



1;

mysql-test/lib/mtr_report.pl

+6 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ sub mtr_report_test_skipped($); 
sub mtr_show_failed_diff ($);

sub mtr_report_stats ($);

sub mtr_print_line ();

sub mtr_print_thick_line ();

sub mtr_print_header ();

sub mtr_report (@);

sub mtr_warning (@);
@@ -214,6 +215,10 @@ sub mtr_print_line () { 
  print '-' x 55, "\n";

}



sub mtr_print_thick_line () {

  print '=' x 55, "\n";

}



sub mtr_print_header () {

  print "\n";

  if ( $::opt_timer )
@@ -250,7 +255,7 @@ sub mtr_error (@) { 
sub mtr_debug (@) {

  if ( $::opt_script_debug )

  {

    print "mysql-test-run: DEBUG: ",join(" ", @_),"\n";

    print STDERR "####: ",join(" ", @_),"\n";

  }

}

mysql-test/mysql-test-run.pl

+228 −54

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ create database mysqltest; 
create table mysqltest.t1 (a int,b int,c int);

grant all on mysqltest.t1 to mysqltest_1@localhost;

alter table t1 rename t2;

ERROR 42000: insert command denied to user 'mysqltest_1'@'localhost' for table 't2'

ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'

revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;

delete from mysql.user where user=_binary'mysqltest_1';

drop database mysqltest;