Commit b09c3034 authored by tsmith@maint1.mysql.com's avatar tsmith@maint1.mysql.com
Browse files

Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
parents 825570f5 772c7fc5

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ IF(EMBED_MANIFESTS) 
    ENDIF(NOT tmp_manifest)

    # Set the processor architecture.

    IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

    	SET(PROCESSOR_ARCH "X64") 

    	SET(PROCESSOR_ARCH "amd64") 

    ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

    	SET(PROCESSOR_ARCH "X86")

    ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

client/mysqldump.c

+12 −11
Original line number Diff line number Diff line
@@ -686,6 +686,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    break;

  case 'T':

    opt_disable_keys=0;



    if (strlen(argument) >= FN_REFLEN)

    {

      /*

        This check is made because the some the file functions below

        have FN_REFLEN sized stack allocated buffers and will cause

        a crash even if the input destination buffer is large enough

        to hold the output.

      */

      die(EX_USAGE, "Input filename too long: %s", argument);

    }



    break;

  case '#':

    DBUG_PUSH(argument ? argument : default_dbug_option);
@@ -2324,17 +2336,6 @@ static void dump_table(char *table, char *db) 
  {

    char filename[FN_REFLEN], tmp_path[FN_REFLEN];



    if (strlen(path) >= FN_REFLEN)

    {

      /*

        This check is made because the some the file functions below

        have FN_REFLEN sized stack allocated buffers and will cause

        a crash even if the input destination buffer is large enough

        to hold the output.

      */

      die(EX_USAGE, "Input filename or options too long: %s", path);

    }



    /*

      Convert the path to native os format

      and resolve to the full filepath.

include/my_global.h

+6 −1
Original line number Diff line number Diff line
@@ -895,7 +895,12 @@ typedef unsigned long uint32; /* Short for unsigned integer >= 32 bits */ 
typedef unsigned long	ulong;		  /* Short for unsigned long */

#endif

#ifndef longlong_defined

#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8

/* 

  Using [unsigned] long long is preferable as [u]longlong because we use 

  [unsigned] long long unconditionally in many places, 

  for example in constants with [U]LL suffix.

*/

#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8

typedef unsigned long long int ulonglong; /* ulong or unsigned long long */

typedef long long int	longlong;

#else

mysql-test/include/have_outfile.inc

+1 −1
Original line number Diff line number Diff line 
-- require r/have_outfile.require

disable_query_log;

select load_file(concat(@tmpdir,"/outfile.test"));

--exec rm $MYSQLTEST_VARDIR/tmp/outfile.test

--remove_file $MYSQLTEST_VARDIR/tmp/outfile.test

enable_query_log;

mysql-test/lib/mtr_process.pl

+19 −14
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ sub spawn_impl ($$$$$$$) { 


    if ( $pid )

    {

      select(STDOUT) if $::glob_win32_perl;

      return spawn_parent_impl($pid,$mode,$path);

    }

    else
@@ -163,9 +164,6 @@ sub spawn_impl ($$$$$$$) { 
	{

	  # Don't redirect stdout on ActiveState perl since this is

          # just another thread in the same process.

          # Should be fixed so that the thread that is created with fork

          # executes the exe in another process and wait's for it to return.

          # In the meanwhile, we get all the output from mysqld's to screen

	}

        elsif ( ! open(STDOUT,$log_file_open_mode,$output) )

        {
@@ -175,7 +173,7 @@ sub spawn_impl ($$$$$$$) { 


      if ( $error )

      {

        if ( $output eq $error )

        if ( !$::glob_win32_perl and $output eq $error )

        {

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

          {
@@ -184,15 +182,7 @@ sub spawn_impl ($$$$$$$) { 
        }

        else

        {

	  if ( $::glob_win32_perl )

	  {

	    # Don't redirect stdout on ActiveState perl since this is

	    # just another thread in the same process.

	    # Should be fixed so that the thread that is created with fork

	    # executes the exe in another process and wait's for it to return.

	    # In the meanwhile, we get all the output from mysqld's to screen

	  }

          elsif ( ! open(STDERR,$log_file_open_mode,$error) )

          if ( ! open(STDERR,$log_file_open_mode,$error) )

          {

            mtr_child_error("can't redirect STDERR to \"$error\": $!");

          }
@@ -611,6 +601,11 @@ sub mtr_check_stop_servers ($) { 
    if ( $pid )

    {

      # Server is still alive, put it in list to be hard killed

      if ($::glob_win32_perl)

      {

	# Kill the real process if it's known

	$pid= $srv->{'real_pid'} if ($srv->{'real_pid'});

      }

      $kill_pids{$pid}= 1;



      # Write a message to the process's error log (if it has one)
@@ -664,6 +659,16 @@ sub mtr_check_stop_servers ($) { 
	  }

	}



	if ($::glob_win32_perl and $srv->{'real_pid'})

	{

	  # Wait for the pseudo pid - if the real_pid was known

	  # the pseudo pid has not been waited for yet, wai blocking

	  # since it's "such a simple program"

	  mtr_verbose("Wait for pseudo process $srv->{'pid'}");

	  my $ret_pid= waitpid($srv->{'pid'}, 0);

	  mtr_verbose("Pseudo process $ret_pid died");

	}



	$srv->{'pid'}= 0;

      }

    }
@@ -1041,7 +1046,7 @@ sub sleep_until_file_created ($$$) { 
  {

    if ( -r $pidfile )

    {

      return $pid;

      return 1;

    }



    # Check if it died after the fork() was successful