Merge (a25fc95d) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-dist

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		# tree can then be picked up by "make dist" to create the "pristine source
		# package" that is used as the basis for all other binary builds.
		#
		make distclean
		test -f Makefile && make distclean
		(cd storage/bdb/dist && sh s_all)
		(cd storage/innobase && aclocal && autoheader && \
		libtoolize --automake --force --copy && \

mysql-test/mysql-test-run.pl

+25 −24

Original line number	Diff line number	Diff line
		@@ -290,7 +290,7 @@ our $opt_user_test;
		our $opt_valgrind= 0;
		our $opt_valgrind_mysqld= 0;
		our $opt_valgrind_mysqltest= 0;
		our $opt_valgrind_all= 0;
		our $default_valgrind_options= "-v --show-reachable=yes";
		our $opt_valgrind_options;
		our $opt_valgrind_path;

		@@ -629,10 +629,9 @@ sub command_line_setup () {
		# Coverage, profiling etc
		'gcov' => \$opt_gcov,
		'gprof' => \$opt_gprof,
		'valgrind' => \$opt_valgrind,
		'valgrind\|valgrind-all' => \$opt_valgrind,
		'valgrind-mysqltest' => \$opt_valgrind_mysqltest,
		'valgrind-mysqld' => \$opt_valgrind_mysqld,
		'valgrind-all' => \$opt_valgrind_all,
		'valgrind-options=s' => \$opt_valgrind_options,
		'valgrind-path=s' => \$opt_valgrind_path,

		@@ -816,20 +815,32 @@ sub command_line_setup () {
		}
		}

		# Turn on valgrinding of all executables if "valgrind" or "valgrind-all"
		if ( $opt_valgrind or $opt_valgrind_all )
		# Check valgrind arguments
		if ( $opt_valgrind or $opt_valgrind_path or defined $opt_valgrind_options)
		{
		mtr_report("Turning on valgrind for all executables");
		$opt_valgrind= 1;
		$opt_valgrind_mysqld= 1;
		$opt_valgrind_mysqltest= 1;
		}
		elsif ( $opt_valgrind_mysqld or $opt_valgrind_mysqltest )
		elsif ( $opt_valgrind_mysqld )
		{
		# If test's are run for a specific executable, turn on
		# verbose and show-reachable
		mtr_report("Turning on valgrind for mysqld(s) only");
		$opt_valgrind= 1;
		$opt_valgrind_all= 1;
		}
		elsif ( $opt_valgrind_mysqltest )
		{
		mtr_report("Turning on valgrind for mysqltest only");
		$opt_valgrind= 1;
		}

		if ( $opt_valgrind )
		{
		# Set valgrind_options to default unless already defined
		$opt_valgrind_options=$default_valgrind_options
		unless defined $opt_valgrind_options;

		mtr_report("Running valgrind with options \"$opt_valgrind_options\"");
		}

		if ( ! $opt_testcase_timeout )
		@@ -3694,17 +3705,8 @@ sub valgrind_arguments {
		mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir)
		if -f "$glob_mysql_test_dir/valgrind.supp";

		if ( $opt_valgrind_all )
		{
		mtr_add_arg($args, "-v");
		mtr_add_arg($args, "--show-reachable=yes");
		}

		if ( $opt_valgrind_options )
		{
		# Add valgrind options, can be overriden by user
		mtr_add_arg($args, '%s', $_) for (split(' ', $opt_valgrind_options));
		}


		mtr_add_arg($args, $$exe);

		@@ -3816,12 +3818,11 @@ Options for coverage, profiling etc
		gcov FIXME
		gprof FIXME
		valgrind Run the "mysqltest" and "mysqld" executables using
		valgrind
		valgrind-all Same as "valgrind" but will also add "verbose" and
		"--show-reachable" flags to valgrind
		valgrind with options($default_valgrind_options)
		valgrind-all Synonym for --valgrind
		valgrind-mysqltest Run the "mysqltest" executable with valgrind
		valgrind-mysqld Run the "mysqld" executable with valgrind
		valgrind-options=ARGS Extra options to give valgrind
		valgrind-options=ARGS Options to give valgrind, replaces default options
		valgrind-path=[EXE] Path to the valgrind executable

		Misc options

netware/BUILD/compile-netware-END

+0 −4

Original line number	Diff line number	Diff line
		@@ -21,10 +21,6 @@ rm -rf Makefile.in.bk
		# run auto tools
		. $path/compile-AUTOTOOLS

		# For NetWare there is no comp_err but comp_err.linux
		sed -e "s/comp_err\$(EXEEXT)/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$
		mv extra/Makefile.am.$$ extra/Makefile.am

		# configure
		./configure $base_configs $extra_configs

netware/Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
		client/mysqlshow.def client/mysqltest.def \
		client/mysqlslap.def \
		sql/mysqld.def extra/mysql_waitpid.def \
		extra/mysql_install.def extra/my_print_defaults.def \
		extra/my_print_defaults.def \
		extra/perror.def extra/replace.def \
		extra/resolveip.def extra/comp_err.def \
		extra/resolve_stack_dump.def \
		@@ -54,7 +54,7 @@ EXTRA_DIST= comp_err.def init_db.sql install_test_db.ncf \
		libmysqlmain.c my_manage.c my_manage.h \
		my_print_defaults.def myisam_ftdump.def myisamchk.def \
		myisamlog.def myisampack.def mysql.def mysql.xdc \
		mysql_fix_privilege_tables.pl mysql_install.def \
		mysql_fix_privilege_tables.pl \
		mysql_install_db.c mysql_install_db.def \
		mysql_secure_installation.pl mysql_test_run.c \
		mysql_test_run.def mysql_waitpid.def mysqladmin.def \

netware/mysql_install.def

deleted100644 → 0

+0 −10

Original line number	Diff line number	Diff line
		#------------------------------------------------------------------------------
		# My Print Defaults
		#------------------------------------------------------------------------------
		MODULE libc.nlm
		COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
		DESCRIPTION "MySQL Install Tool"
		VERSION 4, 0
		XDCDATA ../netware/mysql.xdc
		#DEBUG