Merge bk-internal.mysql.com:/home/bk/mysql-5.0 (ee4c9104) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+6 −3

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ PENDING/*
		TAGS
		ac_available_languages_fragment
		aclocal.m4
		analyse.test
		autom4te-2.53.cache/*
		autom4te-2.53.cache/output.0
		autom4te-2.53.cache/requests
		@@ -260,6 +261,7 @@ client/mf_iocache.c
		client/mf_iocache.cc
		client/mysql
		client/mysqladmin
		client/mysqladmin.c
		client/mysqlbinlog
		client/mysqlcheck
		client/mysqldump
		@@ -300,14 +302,17 @@ depcomp
		emacs.h
		extra/charset2html
		extra/comp_err
		extra/created_include_files
		extra/my_print_defaults
		extra/mysql_install
		extra/mysql_tzinfo_to_sql
		extra/mysql_waitpid
		extra/mysqld_error.h
		extra/perror
		extra/replace
		extra/resolve_stack_dump
		extra/resolveip
		extra/sql_state.h
		extra/tztime.cc
		fcns.c
		fcns.h
		@@ -538,6 +543,7 @@ myisam/test2.MYD
		myisam/test2.MYI
		mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		mysql-4.0.2-alpha.tar.gz
		mysql-4.1.8-win-src.zip
		mysql-5.0.2-alpha.tar.gz
		mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		mysql-test/gmon.out
		@@ -983,6 +989,3 @@ vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		extra/mysqld_error.h
		extra/sql_state.h
		extra/created_include_files

BitKeeper/etc/logging_ok

+4 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ Administrador@light.
		Administrator@co3064164-a.
		Administrator@co3064164-a.rochd1.qld.optushome.com.au
		Administrator@fred.
		Administrator@w2k.
		Greg@greg-laptop.
		Miguel@light.local
		Sinisa@sinisa.nasamreza.org
		@@ -109,6 +110,7 @@ magnus@neptunus.(none)
		magnus@shellback.(none)
		marko@hundin.mysql.fi
		mats@mysql.com
		matt@booty.(none)
		matt@mysql.com
		matthias@three.local.lan
		miguel@hegel.(none)
		@@ -164,6 +166,7 @@ papa@gbichot.local
		patg@krsna.patg.net
		patg@patrick-galbraiths-computer.local
		paul@central.snake.net
		paul@frost.snake.net
		paul@ice.local
		paul@ice.snake.net
		paul@kite-hub.kitebird.com
		@@ -203,6 +206,7 @@ serg@sergbook.mylan
		serg@sergbook.mysql.com
		sergefp@mysql.com
		sinisa@rhols221.adsl.netsonic.fi
		stewart@mysql.com
		tfr@beta.frontier86.ee
		tfr@indrek.tfr.cafe.ee
		tfr@sarvik.tfr.cafe.ee

Build-tools/Do-compile

+39 −4

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ use Sys::Hostname;
		$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env="";
		$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";
		$opt_tmp=$opt_version_suffix="";
		$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;
		$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;
		$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;
		$opt_embedded_test=$opt_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;

		GetOptions(
		"bdb",
		@@ -25,6 +25,7 @@ GetOptions(
		"delete",
		"distribution=s",
		"enable-shared",
		"embedded-test",
		"fast-benchmark",
		"help\|Information",
		"innodb",
		@@ -40,6 +41,7 @@ GetOptions(
		"one-error",
		"perl-files=s",
		"perl-options=s",
		"ps-test",
		"raid",
		"readline",
		"stage=i",
		@@ -55,6 +57,8 @@ GetOptions(
		"version-suffix=s",
		"with-archive",
		"with-cluster",
		"with-csv",
		"with-example",
		"with-debug",
		"with-low-memory",
		"with-other-libc=s",
		@@ -274,8 +278,11 @@ if ($opt_stage <= 1)
		$opt_config_options.= " --with-libedit";
		}
		$opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);
		$opt_embedded_test= 0 if ($opt_without_embedded);
		$opt_config_options.= " --with-archive-storage-engine" if ($opt_with_archive);
		$opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);
		$opt_config_options.= " --with-csv-storage-engine" if ($opt_with_csv);
		$opt_config_options.= " --with-example-storage-engine" if ($opt_with_example);

		# Only enable InnoDB when requested (required to be able to
		# build the "Classic" packages that do not include InnoDB)
		@@ -376,13 +383,29 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
		if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
		{
		my $flags= "";
		my $force= "";
		$flags.= " --with-ndbcluster" if ($opt_with_cluster);
		$flags.= " --force" if (!$opt_one_error);
		log_timestamp();
		info("Running test suite");
		system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);
		safe_cd("${test_dir}/mysql-test");
		check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

		if ($opt_ps_test)
		{
		log_timestamp();
		info("Running test suite using prepared statements");
		check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
		}

		if ($opt_embedded_test)
		{
		log_timestamp();
		info("Running embedded server test suite");
		# Embedded server and NDB don't jive
		$flags=~ s/ --with-ndbcluster//;
		check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
		}
		# 'mysql-test-run' writes its own final message for log evaluation.
		}

		@@ -528,6 +551,9 @@ Delete the distribution file.
		--distribution=<distribution_file>
		Name of the MySQL source distribution file.

		--embedded-test
		Run the test suite against the embedded server

		--enable-shared
		Compile with shared libraries

		@@ -576,6 +602,9 @@ Compile and install the given perl modules.
		--perl-options=<options>
		Build Perl modules with the additional options

		--ps-test
		Run an additional test run, using prepared statements

		--raid
		Compile with RAID support

		@@ -612,11 +641,17 @@ If user is empty then no mail is sent.
		Set name suffix (e.g. 'com' or '-max') for a distribution

		--with archive
		Enable the Archive storage Engine
		Enable the Archive storage engine

		--with cluster
		Compile and test with NDB Cluster enabled

		--with-csv
		Enable the CSV storage engine

		--with-example
		Enable the Example storage engine

		--with-debug
		Build binaries with debug information (implies "--no-strip")

Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ tags:
		# Test installation

		test:
		cd mysql-test ; ./mysql-test-run
		cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol

		# Don't update the files from bitkeeper
		%::SCCS/s.%

VC++Files/client/mysqltest.dsp

+8 −8

Original line number	Diff line number	Diff line
		@@ -42,8 +42,8 @@ RSC=rc.exe
		# PROP Output_Dir ".\debug"
		# PROP Intermediate_Dir ".\debug"
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "USE_TLS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "USE_TLS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD BASE CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD BASE MTL /nologo /tlb".\debug\mysqltest.tlb" /win32
		# ADD MTL /nologo /tlb".\debug\mysqltest.tlb" /win32
		# ADD BASE RSC /l 1033 /d "_DEBUG"
		@@ -52,8 +52,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib mysys.lib /nologo /out:"..\client_debug\mysqltest.exe" /incremental:no /libpath:"..\lib_debug\" /debug /pdb:".\debug\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib mysys.lib /nologo /out:"..\client_debug\mysqltest.exe" /incremental:no /libpath:"..\lib_debug\" /debug /pdb:".\debug\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\client_debug\mysqltest.exe" /incremental:no /libpath:"..\lib_debug\" /debug /pdb:".\debug\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\client_debug\mysqltest.exe" /incremental:no /libpath:"..\lib_debug\" /debug /pdb:".\debug\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386

		!ELSEIF "$(CFG)" == "mysqltest - Win32 classic"

		@@ -77,8 +77,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386

		!ELSEIF "$(CFG)" == "mysqltest - Win32 Release"

		@@ -102,8 +102,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386

		!ENDIF