Commit 86686a3b authored by unknown's avatar unknown
Browse files

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

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 8103b543 a0e5d9da

BUILD/compile-dist

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# tree can then be picked up by "make dist" to create the "pristine source

# package" that is used as the basis for all other binary builds.

#

make distclean

test -f Makefile && make distclean

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

include/m_string.h

+1 −1
Original line number Diff line number Diff line
@@ -256,6 +256,6 @@ typedef struct 
} LEX_STRING;



#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))

#define C_STRING_WITH_SIZE(X) ((char *) (X)), ((uint) (sizeof(X) - 1))

#define C_STRING_WITH_LEN(X) ((char *) (X)), ((uint) (sizeof(X) - 1))



#endif

include/my_global.h

+3 −0
Original line number Diff line number Diff line
@@ -797,6 +797,9 @@ typedef SOCKET_SIZE_TYPE size_socket; 
#define DBL_MAX		1.79769313486231470e+308

#define FLT_MAX		((float)3.40282346638528860e+38)

#endif

#ifndef SSIZE_MAX

#define SSIZE_MAX ((~((size_t) 0)) / 2)

#endif



#if !defined(HAVE_ISINF) && !defined(isinf)

#define isinf(X)    0

mysql-test/lib/mtr_process.pl

+13 −4
Original line number Diff line number Diff line
@@ -880,19 +880,28 @@ sub mtr_kill_processes ($) { 
sub mtr_kill_process ($$$$) {

  my $pid= shift;

  my $signal= shift;

  my $retries= shift;

  my $total_retries= shift;

  my $timeout= shift;



  while (1)

  for (my $cur_attempt= 1; $cur_attempt <= $total_retries; ++$cur_attempt)

  {

    mtr_debug("Sending $signal to $pid...");



    kill($signal, $pid);



    last unless kill (0, $pid) and $retries--;

    unless (kill (0, $pid))

    {

      mtr_debug("Process $pid died.");

      return;

    }



    mtr_debug("Sleep $timeout second waiting for processes to die");

    mtr_debug("Sleeping $timeout second(s) waiting for processes to die...");



    sleep($timeout);

  }



  mtr_debug("Process $pid is still alive after $total_retries " .

            "of sending signal $signal.");

}



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

mysql-test/mysql-test-run.pl

+73 −30
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ our $opt_user_test; 
our $opt_valgrind= 0;

our $opt_valgrind_mysqld= 0;

our $opt_valgrind_mysqltest= 0;

our $opt_valgrind_all= 0;

our $default_valgrind_options= "-v --show-reachable=yes";

our $opt_valgrind_options;

our $opt_valgrind_path;
@@ -629,10 +629,9 @@ sub command_line_setup () { 
             # Coverage, profiling etc

             'gcov'                     => \$opt_gcov,

             'gprof'                    => \$opt_gprof,

             'valgrind'                 => \$opt_valgrind,

             'valgrind|valgrind-all'    => \$opt_valgrind,

             'valgrind-mysqltest'       => \$opt_valgrind_mysqltest,

             'valgrind-mysqld'          => \$opt_valgrind_mysqld,

             'valgrind-all'             => \$opt_valgrind_all,

             'valgrind-options=s'       => \$opt_valgrind_options,

             'valgrind-path=s'          => \$opt_valgrind_path,
@@ -816,20 +815,32 @@ sub command_line_setup () { 
    }

  }



  # Turn on valgrinding of all executables if "valgrind" or "valgrind-all"

  if ( $opt_valgrind or $opt_valgrind_all )

  # Check valgrind arguments

  if ( $opt_valgrind or $opt_valgrind_path or defined $opt_valgrind_options)

  {

    mtr_report("Turning on valgrind for all executables");

    $opt_valgrind= 1;

    $opt_valgrind_mysqld= 1;

    $opt_valgrind_mysqltest= 1;

  }

  elsif ( $opt_valgrind_mysqld or $opt_valgrind_mysqltest )

  elsif ( $opt_valgrind_mysqld )

  {

    # If test's are run for a specific executable, turn on

    # verbose and show-reachable

    mtr_report("Turning on valgrind for mysqld(s) only");

    $opt_valgrind= 1;

    $opt_valgrind_all= 1;

  }

  elsif ( $opt_valgrind_mysqltest )

  {

    mtr_report("Turning on valgrind for mysqltest only");

    $opt_valgrind= 1;

  }



  if ( $opt_valgrind )

  {

    # Set valgrind_options to default unless already defined

    $opt_valgrind_options=$default_valgrind_options

      unless defined $opt_valgrind_options;



    mtr_report("Running valgrind with options \"$opt_valgrind_options\"");

  }



  if ( ! $opt_testcase_timeout )
@@ -3109,22 +3120,58 @@ sub im_stop($) { 


  # Try graceful shutdown.



  mtr_debug("IM-main pid: $instance_manager->{'pid'}");

  mtr_debug("Stopping IM-main...");



  mtr_kill_process($instance_manager->{'pid'}, 'TERM', 10, 1);



  # If necessary, wait for angel process to die.



  if (defined $instance_manager->{'angel_pid'})

  {

    mtr_debug("IM-angel pid: $instance_manager->{'angel_pid'}");

    mtr_debug("Waiting for IM-angel to die...");



    my $total_attempts= 10;



    for (my $cur_attempt=1; $cur_attempt <= $total_attempts; ++$cur_attempt)

    {

      unless (kill (0, $instance_manager->{'angel_pid'}))

      {

        mtr_debug("IM-angel died.");

        last;

      }



      sleep(1);

    }

  }



  # Check that all processes died.



  my $clean_shutdown= 0;



  while (1)

  {

    last if kill (0, $instance_manager->{'pid'});

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

    {

      mtr_debug("IM-main is still alive.");

      last;

    }



    last if (defined $instance_manager->{'angel_pid'}) &&

            kill (0, $instance_manager->{'angel_pid'});

    if (defined $instance_manager->{'angel_pid'} &&

        kill (0, $instance_manager->{'angel_pid'}))

    {

      mtr_debug("IM-angel is still alive.");

      last;

    }



    foreach my $pid (@mysqld_pids)

    {

      last if kill (0, $pid);

      if (kill (0, $pid))

      {

        mtr_debug("Guarded mysqld ($pid) is still alive.");

        last;

      }

    }



    $clean_shutdown= 1;
@@ -3135,15 +3182,21 @@ sub im_stop($) { 


  unless ($clean_shutdown)

  {



    if (defined $instance_manager->{'angel_pid'})

    {

      mtr_debug("Killing IM-angel...");

      mtr_kill_process($instance_manager->{'angel_pid'}, 'KILL', 10, 1)

      if defined $instance_manager->{'angel_pid'};

    }

    

    mtr_debug("Killing IM-main...");

    mtr_kill_process($instance_manager->{'pid'}, 'KILL', 10, 1);



    # Shutdown managed mysqld-processes. Some of them may be nonguarded, so IM

    # will not stop them on shutdown. So, we should firstly try to end them

    # legally.



    mtr_debug("Killing guarded mysqld(s)...");

    mtr_kill_processes(\@mysqld_pids);



    # Complain in error log so that a warning will be shown.
@@ -3694,17 +3747,8 @@ sub valgrind_arguments { 
  mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir)

    if -f "$glob_mysql_test_dir/valgrind.supp";



  if ( $opt_valgrind_all )

  {

    mtr_add_arg($args, "-v");

    mtr_add_arg($args, "--show-reachable=yes");

  }



  if ( $opt_valgrind_options )

  {

  # Add valgrind options, can be overriden by user

  mtr_add_arg($args, '%s', $_) for (split(' ', $opt_valgrind_options));

  }





  mtr_add_arg($args, $$exe);
@@ -3816,12 +3860,11 @@ Options for coverage, profiling etc 
  gcov                  FIXME

  gprof                 FIXME

  valgrind              Run the "mysqltest" and "mysqld" executables using

                        valgrind

  valgrind-all          Same as "valgrind" but will also add "verbose" and

                        "--show-reachable" flags to valgrind

                        valgrind with options($default_valgrind_options)

  valgrind-all          Synonym for --valgrind

  valgrind-mysqltest    Run the "mysqltest" executable with valgrind

  valgrind-mysqld       Run the "mysqld" executable with valgrind

  valgrind-options=ARGS Extra options to give valgrind

  valgrind-options=ARGS Options to give valgrind, replaces default options

  valgrind-path=[EXE]   Path to the valgrind executable



Misc options