Commit 82f674f9 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 

into deer.(none):/home/hf/work/mysql-4.1.clean
parents 6b761d86 2747666d

VC++Files/sql/mysqld.dsp

+7 −3
Original line number Diff line number Diff line
@@ -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 "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_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 "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_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"
@@ -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 "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_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 "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_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 "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_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 "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_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"
@@ -451,6 +451,10 @@ SOURCE=.\gstream.cpp 
# End Source File

# Begin Source File



SOURCE=.\ha_blackhole.cpp

# End Source File

# Begin Source File



SOURCE=.\ha_berkeley.cpp

# End Source File

# Begin Source File

innobase/buf/buf0buf.c

+9 −0
Original line number Diff line number Diff line
@@ -1762,6 +1762,15 @@ buf_page_create( 
	buf_flush_free_margin();



	frame = block->frame;



	/* Reset to zero the file flush lsn field in the page; if the first

	page of an ibdata file is 'created' in this function into the buffer

	pool then we lose the original contents of the file flush lsn stamp.

	Then InnoDB could in a crash recovery print a big, false, corruption

	warning if the stamp contains an lsn bigger than the ib_logfile lsn. */



	memset(frame + FIL_PAGE_FILE_FLUSH_LSN, 0, 8);



#ifdef UNIV_DEBUG

	buf_dbg_counter++;

mysql-test/mysql-test-run.pl

+33 −2
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ sub executable_setup (); 
sub environment_setup ();

sub kill_running_server ();

sub kill_and_cleanup ();

sub ndbcluster_support ();

sub ndbcluster_install ();

sub ndbcluster_start ();

sub ndbcluster_stop ();
@@ -319,6 +320,12 @@ sub main () { 
  initial_setup();

  command_line_setup();

  executable_setup();

  

  if (! $opt_skip_ndbcluster and ! $opt_with_ndbcluster)

  {

    $opt_with_ndbcluster= ndbcluster_support();

  }



  environment_setup();

  signal_setup();
@@ -1026,6 +1033,23 @@ sub kill_and_cleanup () { 
#

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



sub ndbcluster_support () {



  # check ndbcluster support by testing using a switch

  # that is only available in that case

  if ( mtr_run($exe_mysqld,

	       ["--no-defaults",

	        "--ndb-use-exact-count",

	        "--help"],

	       "", "/dev/null", "/dev/null", "") != 0 )

  {

    mtr_report("No ndbcluster support");

    return 0;

  }

  mtr_report("Has ndbcluster support");

  return 1;

}



# FIXME why is there a different start below?!



sub ndbcluster_install () {
@@ -1663,13 +1687,15 @@ sub mysqld_arguments ($$$$$) { 


  if ( $type eq 'master' )

  {

    my $id= $idx > 0 ? $idx + 101 : 1;



    mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,

                $opt_vardir, $sidx);

    mtr_add_arg($args, "%s--pid-file=%s", $prefix,

                $master->[$idx]->{'path_mypid'});

    mtr_add_arg($args, "%s--port=%d", $prefix,

                $master->[$idx]->{'path_myport'});

    mtr_add_arg($args, "%s--server-id=1", $prefix);

    mtr_add_arg($args, "%s--server-id=%d", $prefix, $id);

    mtr_add_arg($args, "%s--socket=%s", $prefix,

                $master->[$idx]->{'path_mysock'});

    mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:50M", $prefix);
@@ -1677,6 +1703,11 @@ sub mysqld_arguments ($$$$$) { 
    mtr_add_arg($args, "%s--datadir=%s", $prefix,

                $master->[$idx]->{'path_myddir'});



    if ( $idx > 0 )

    {

      mtr_add_arg($args, "%s--skip-innodb", $prefix);

    }



    if ( $opt_skip_ndbcluster )

    {

      mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
@@ -1686,7 +1717,7 @@ sub mysqld_arguments ($$$$$) { 
  if ( $type eq 'slave' )

  {

    my $slave_server_id=  2 + $idx;

    my $slave_rpl_rank= $idx > 0 ? 2 : $slave_server_id;

    my $slave_rpl_rank= $slave_server_id;



    mtr_add_arg($args, "%s--datadir=%s", $prefix,

                $slave->[$idx]->{'path_myddir'});

mysql-test/r/rpl_slave_status.result

+5 −5
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ Master_User rpl 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	357

Relay_Log_File	slave-relay-bin.000001

Relay_Log_Pos	401

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	No

Slave_SQL_Running	Yes
@@ -40,8 +40,8 @@ Replicate_Wild_Ignore_Table 
Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	357

Relay_Log_Space	401

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

mysql-test/t/rpl_slave_status.test

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ connection slave; 
stop slave;

start slave;

--replace_result $MASTER_MYPORT MASTER_MYPORT

--replace_column 7 # 8 # 9 # 22 # 23 #

--vertical_results

show slave status;