Commit 173e5df3 authored by unknown's avatar unknown
Browse files

Merge mishka.local:/home/my/mysql-4.1 

into  mishka.local:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
  Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
configure.in:
  Auto merged
mysql-test/include/ps_conv.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/client/mysqltest.dsp:
  manual merge
VC++Files/sql/mysqld.dsp:
  manual merge
mysql-test/r/grant2.result:
  patch merge
mysql-test/r/subselect2.result:
  manual merge
mysql-test/t/grant2.test:
  patch merge
mysys/charset.c:
  Remove already deleted function
sql/examples/ha_archive.h:
  Manual merge
sql/sql_acl.cc:
  manual merge
sql/sql_db.cc:
  merge (no differences)
sql/sql_select.cc:
  manual merge
sql/table.h:
  merge (no differences)
tests/mysql_client_test.c:
  patch merge
parents b1195383 e0f9b8a8

.bzrignore

+2 −2
Original line number Diff line number Diff line
@@ -1036,7 +1036,9 @@ support-files/MacOSX/Description.plist 
support-files/MacOSX/Info.plist

support-files/MacOSX/ReadMe.txt

support-files/MacOSX/StartupParameters.plist

support-files/MacOSX/postflight

support-files/MacOSX/postinstall

support-files/MacOSX/preflight

support-files/MacOSX/preinstall

support-files/binary-configure

support-files/my-huge.cnf
@@ -1121,5 +1123,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
support-files/MacOSX/postflight

support-files/MacOSX/preflight

VC++Files/sql/mysqld.dsp

+11 −7
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../zlib" /I "../include" /I "../regex" /I "../extra/yassl/include" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../zlib" /I "../include" /I "../regex" /I "../extra/yassl/include" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_ARCHIVE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x410 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -75,7 +75,7 @@ LINK32=xilink6.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "HAVE_EXAMPLE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# SUBTRACT CPP /Fr /YX

# ADD BASE RSC /l 0x410 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -102,7 +102,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G5 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN32__" /D "DBUG_OFF" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "HAVE_INNOBASE_DB" /D "HAVE_ARCHIVE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x410 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -130,7 +130,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_EXAMPLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -159,7 +159,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_EXAMPLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -215,7 +215,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D MYSQL_SERVER_SUFFIX=-pro /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "HAVE_ARCHIVE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D MYSQL_SERVER_SUFFIX=-pro /FD /c

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe
@@ -272,7 +272,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "HAVE_INNOBASE_DB" /D "HAVE_ARCHIVE_DB" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -460,6 +460,10 @@ SOURCE=.\examples\ha_archive.cpp 
# End Source File

# Begin Source File



SOURCE=.\examples\ha_example.cpp

# End Source File

# Begin Source File



SOURCE=.\ha_blackhole.cpp

# End Source File

# Begin Source File

mysql-test/include/ps_conv.inc

+16 −0
Original line number Diff line number Diff line
@@ -576,15 +576,19 @@ set @arg00= 9223372036854775807 ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

                        @arg00, @arg00, @arg00, @arg00, @arg00 ;

--vertical_results

--replace_result e+0 e+

execute my_select ;

--horizontal_results

--replace_result e+0 e+

execute my_delete ;

set @arg00= '9223372036854775807' ;

execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

                        @arg00, @arg00, @arg00, @arg00, @arg00 ;

--vertical_results

--replace_result e+0 e+

execute my_select ;

--horizontal_results

--replace_result e+0 e+

execute my_delete ;

# Use the minimum BIGINT from the manual

#
@@ -592,15 +596,19 @@ set @arg00= -9223372036854775808 ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

                        @arg00, @arg00, @arg00, @arg00, @arg00 ;

--vertical_results

--replace_result e+0 e+

execute my_select ;

--horizontal_results

--replace_result e+0 e+

execute my_delete ;

set @arg00= '-9223372036854775808' ;

execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

                        @arg00, @arg00, @arg00, @arg00, @arg00 ;

--vertical_results

--replace_result e+0 e+

execute my_select ;

--horizontal_results

--replace_result e+0 e+

execute my_delete ;



# Numeric overflow of columns(c1, c2, c3, c4, c5, c12) with type not in
@@ -610,8 +618,10 @@ set @arg00= 1.11111111111111111111e+50 ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

                        @arg00, @arg00, @arg00, @arg00, @arg00 ;

--vertical_results

--replace_result e+0 e+

execute my_select ;

--horizontal_results

--replace_result e+0 e+

execute my_delete ;

# Attention: The columns(c1,c2,c3,c4,c5,c6) do not get the overflow,

#             because the string is treated as written integer and
@@ -620,15 +630,19 @@ set @arg00= '1.11111111111111111111e+50' ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

                        @arg00, @arg00, @arg00, @arg00, @arg00 ;

--vertical_results

--replace_result e+0 e+

execute my_select ;

--horizontal_results

--replace_result e+0 e+

execute my_delete ;

set @arg00= -1.11111111111111111111e+50 ;

execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

                        @arg00, @arg00, @arg00, @arg00, @arg00 ;

--vertical_results

--replace_result e+0 e+

execute my_select ;

--horizontal_results

--replace_result e+0 e+

execute my_delete ;

# Attention: The columns(c1,c2,c3,c4,c5,c6) do not get the overflow,

#             because the string is treated as written integer and
@@ -637,8 +651,10 @@ set @arg00= '-1.11111111111111111111e+50' ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

                        @arg00, @arg00, @arg00, @arg00, @arg00 ;

--vertical_results

--replace_result e+0 e+

execute my_select ;

--horizontal_results

--replace_result e+0 e+

execute my_delete ;



########################## test of string types ##########################

mysql-test/lib/mtr_process.pl

+50 −19
Original line number Diff line number Diff line
@@ -185,10 +185,6 @@ sub spawn_parent_impl { 


  if ( $mode eq 'run' or $mode eq 'test' )

  {

    my $exit_value= -1;

#    my $signal_num=  0;

#    my $dumped_core= 0;



    if ( $mode eq 'run' )

    {

      # Simple run of command, we wait for it to return
@@ -199,12 +195,7 @@ sub spawn_parent_impl { 
        mtr_error("$path ($pid) got lost somehow");

      }



      $exit_value=  $?;

#      $exit_value=  $? >> 8;

#      $signal_num=  $? & 127;

#      $dumped_core= $? & 128;



      return $exit_value;

      return mtr_process_exit_status($?);

    }

    else

    {
@@ -218,6 +209,8 @@ sub spawn_parent_impl { 
      # FIXME is this as it should be? Can't mysqld terminate

      # normally from running a test case?



      my $exit_value= -1;

      my $saved_exit_value;

      my $ret_pid;                      # What waitpid() returns



      while ( ($ret_pid= waitpid(-1,0)) != -1 )
@@ -227,13 +220,28 @@ sub spawn_parent_impl { 
        # but not $exit_value, this is flagged from

        # 



        my $timer_name= mtr_timer_timeout($::glob_timers, $ret_pid);

        if ( $timer_name )

        {

          if ( $timer_name eq "suite" )

          {

            # We give up here

            # FIXME we should only give up the suite, not all of the run?

            print STDERR "\n";

            mtr_error("Test suite timeout");

          }

          elsif ( $timer_name eq "testcase" )

          {

            $saved_exit_value=  63;       # Mark as timeout

            kill(9, $pid);                # Kill mysqltest

            next;                         # Go on and catch the termination

          }

        }



        if ( $ret_pid == $pid )

        {

          # We got termination of mysqltest, we are done

          $exit_value=  $?;

#          $exit_value=  $? >> 8;

#          $signal_num=  $? & 127;

#          $dumped_core= $? & 128;

          $exit_value= mtr_process_exit_status($?);

          last;

        }
@@ -281,7 +289,7 @@ sub spawn_parent_impl { 
        }

      }



      return $exit_value;

      return $saved_exit_value || $exit_value;

    }

  }

  else
@@ -292,6 +300,23 @@ sub spawn_parent_impl { 
}





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

# We try to emulate how an Unix shell calculates the exit code

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



sub mtr_process_exit_status {

  my $raw_status= shift;



  if ( $raw_status & 127 )

  {

    return ($raw_status & 127) + 128;  # Signal num + 128

  }

  else

  {

    return $raw_status >> 8;           # Exit code

  }

}





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

#
@@ -331,7 +356,7 @@ sub mtr_kill_leftovers () { 
               });

  }



  mtr_mysqladmin_shutdown(\@args);

  mtr_mysqladmin_shutdown(\@args, 20);



  # We now have tried to terminate nice. We have waited for the listen

  # port to be free, but can't really tell if the mysqld process died
@@ -441,7 +466,8 @@ sub mtr_stop_mysqld_servers ($) { 
  # First try nice normal shutdown using 'mysqladmin'

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



  mtr_mysqladmin_shutdown($spec);

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

  mtr_mysqladmin_shutdown($spec, 70);



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

  # We loop with waitpid() nonblocking to see how many of the ones we
@@ -591,8 +617,9 @@ sub mtr_stop_mysqld_servers ($) { 
#

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



sub mtr_mysqladmin_shutdown () {

sub mtr_mysqladmin_shutdown {

  my $spec= shift;

  my $adm_shutdown_tmo= shift;



  my %mysql_admin_pids;

  my @to_kill_specs;
@@ -631,7 +658,7 @@ sub mtr_mysqladmin_shutdown () { 
      mtr_add_arg($args, "--protocol=tcp"); # Needed if no --socket

    }

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

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

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

    mtr_add_arg($args, "shutdown");

    # We don't wait for termination of mysqladmin

    my $pid= mtr_spawn($::exe_mysqladmin, $args,
@@ -808,11 +835,15 @@ sub sleep_until_file_created ($$$) { 
# FIXME something is wrong, we sometimes terminate with "Hangup" written

# to tty, and no STDERR output telling us why.



# FIXME for some readon, setting HUP to 'IGNORE' will cause exit() to

# write out "Hangup", and maybe loose some output. We insert a sleep...



sub mtr_exit ($) {

  my $code= shift;

#  cluck("Called mtr_exit()");

  local $SIG{HUP} = 'IGNORE';

  kill('HUP', -$$);

  sleep 2;

  exit($code);

}

mysql-test/lib/mtr_report.pl

+8 −1
Original line number Diff line number Diff line
@@ -109,7 +109,14 @@ sub mtr_report_test_failed ($) { 
  my $tinfo= shift;



  $tinfo->{'result'}= 'MTR_RES_FAILED';

  if ( $tinfo->{'timeout'} )

  {

    print "[ fail ]  timeout\n";

  }

  else

  {

    print "[ fail ]\n";

  }



  # FIXME Instead of this test, and meaningless error message in 'else'

  # we should write out into $::path_timefile when the error occurs.