Merge (0a24ac9e) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+16 −0

Original line number	Diff line number	Diff line
		@@ -924,3 +924,19 @@ Docs/Images/mydsn.txt
		Docs/Images/myflowchart.txt
		mysql-test/mysql_test_run_new
		ndb/tools/ndb_test_platform
		help
		ndbcluster-1186
		ndbcluster-1186/SCCS
		ndbcluster-1186/config.ini
		ndbcluster-1186/ndb_1.pid
		ndbcluster-1186/ndb_1_out.log
		ndbcluster-1186/ndb_1_signal.log
		ndbcluster-1186/ndb_2.pid
		ndbcluster-1186/ndb_2_out.log
		ndbcluster-1186/ndb_2_signal.log
		ndbcluster-1186/ndb_3.pid
		ndbcluster-1186/ndb_3_cluster.log
		ndbcluster-1186/ndb_3_out.log
		ndbcluster-1186/ndbcluster.pid
		ndb/tools/ndb_restore
		ac_available_languages_fragment

BitKeeper/etc/logging_ok

+4 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ lenz@mysql.com
		magnus@neptunus.(none)
		magnus@shellback.(none)
		marko@hundin.mysql.fi
		mats@mysql.com
		matt@mysql.com
		matthias@three.local.lan
		miguel@hegel.(none)
		@@ -139,6 +140,7 @@ msvensson@build.mysql.com
		mwagner@cash.mwagner.org
		mwagner@evoq.mwagner.org
		mwagner@here.mwagner.org
		mwagner@mysql.com
		mwagner@work.mysql.com
		mydev@mysql.com
		mysql@home.(none)
		@@ -163,6 +165,7 @@ pem@mysql.com
		peter@linux.local
		peter@mysql.com
		peterg@mysql.com
		petr@mysql.com
		pgulutzan@linux.local
		ram@deer.(none)
		ram@gw.mysql.r18.ru
		@@ -199,6 +202,7 @@ tim@siva.hindu.god
		tim@threads.polyesthetic.msg
		tim@white.box
		tim@work.mysql.com
		timour@mysql.com
		tom@basil-firewall.home.com
		tomas@mc05.(none)
		tomas@poseidon.(none)

Build-tools/Do-compile

+10 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ 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_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_cluster=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=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_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;

		GetOptions(
		@@ -37,6 +37,7 @@ GetOptions(
		"no-test",
		"no-mysqltest",
		"no-benchmark",
		"one-error",
		"perl-files=s",
		"perl-options=s",
		"raid",
		@@ -310,6 +311,7 @@ if ($opt_stage <= 2)
		$command=$make;
		$command.= " $opt_make_options" if (defined($opt_make_options) && $opt_make_options ne "");
		safe_system($command);
		print LOG "Do-compile: Build successful\n";
		}

		#
		@@ -372,11 +374,14 @@ $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();
		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");
		# 'mysql-test-run' writes its own final message for log evaluation.
		}

		#
		@@ -555,7 +560,10 @@ Do not run any tests.
		Do not run the benchmark test (written in perl)

		--no-mysqltest
		Do not run the the mysql-test-run test (Same as 'make test')
		Do not run the mysql-test-run test (Same as 'make test')

		--one-error
		Terminate the mysql-test-run test after the first difference (default: use '--force')

		--no-perl
		Do not compile or install Perl modules, use the system installed ones

VC++Files/client/mysqladmin.dsp

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ LINK32=xilink6.exe
		# Name "mysqladmin - Win32 classic"
		# Begin Source File

		SOURCE=.\mysqladmin.c
		SOURCE=.\mysqladmin.cpp
		# End Source File
		# End Target
		# End Project

client/Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,14 +20,14 @@
		INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \
		$(openssl_includes)
		LIBS = @CLIENT_LIBS@
		DEPLIB= @ndb_mgmclient_libs@ \
		../libmysql/libmysqlclient.la
		DEPLIB= ../libmysql/libmysqlclient.la
		LDADD = @CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)
		bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
		mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen
		noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
		client_priv.h
		mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc
		mysqladmin_SOURCES = mysqladmin.cc
		mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
		mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS)
		mysql_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)