Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build (bbf07e14) · Commits · Software / OSDI20 Artifacts / mariadb

CMakeLists.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,14 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
		STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG
		${CMAKE_CXX_FLAGS_DEBUG})

		STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO
		${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
		STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO
		${CMAKE_C_FLAGS_RELWITHDEBINFO})

		# generate .map files
		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")

		# remove support for Exception handling
		STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
		STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

scripts/make_binary_distribution.sh

+29 −14

Original line number	Diff line number	Diff line
		@@ -54,6 +54,21 @@ for arg do
		esac
		done

		# Avoid too long command lines for cp (bug#27489)
		MCP() {
		for i
		do
		last=$i
		done
		for i
		do
		if test "x$i" != "x$last"
		then
		cp -p $i $last
		fi
		done
		}

		# Remove vendor from $system
		system=`echo $system \| sed -e 's/[a-z]-$.$/\1/g'`

		@@ -259,25 +274,25 @@ copyfileto $BASE/mysql-test \
		mysql-test/valgrind.supp \
		netware/mysql_test_run.nlm netware/install_test_db.ncf

		$CP mysql-test/lib/*.pl $BASE/mysql-test/lib
		$CP mysql-test/t/*.def $BASE/mysql-test/t
		$CP mysql-test/include/*.inc $BASE/mysql-test/include
		$CP mysql-test/include/*.test $BASE/mysql-test/include
		$CP mysql-test/t/*.def $BASE/mysql-test/t
		$CP mysql-test/std_data/.dat mysql-test/std_data/.frm \
		MCP mysql-test/lib/*.pl $BASE/mysql-test/lib
		MCP mysql-test/t/*.def $BASE/mysql-test/t
		MCP mysql-test/include/*.inc $BASE/mysql-test/include
		MCP mysql-test/include/*.test $BASE/mysql-test/include
		MCP mysql-test/t/*.def $BASE/mysql-test/t
		MCP mysql-test/std_data/.dat mysql-test/std_data/.frm \
		mysql-test/std_data/.MYD mysql-test/std_data/.MYI \
		mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
		mysql-test/std_data/des_key_file mysql-test/std_data/.001 \
		mysql-test/std_data/.cnf mysql-test/std_data/.MY* \
		$BASE/mysql-test/std_data
		$CP mysql-test/t/*.test $BASE/mysql-test/t
		$CP mysql-test/t/.imtest mysql-test/t/.disabled $BASE/mysql-test/t
		$CP mysql-test/t/.opt mysql-test/t/.slave-mi $BASE/mysql-test/t
		$CP mysql-test/t/.sh mysql-test/t/.sql $BASE/mysql-test/t
		$CP mysql-test/r/*.result $BASE/mysql-test/r
		$CP mysql-test/r/*.require $BASE/mysql-test/r
		$CP mysql-test/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests
		$CP mysql-test/extra/rpl_tests/*.test $BASE/mysql-test/extra/rpl_tests
		MCP mysql-test/t/*.test $BASE/mysql-test/t
		MCP mysql-test/t/.imtest mysql-test/t/.disabled $BASE/mysql-test/t
		MCP mysql-test/t/.opt mysql-test/t/.slave-mi $BASE/mysql-test/t
		MCP mysql-test/t/.sh mysql-test/t/.sql $BASE/mysql-test/t
		MCP mysql-test/r/*.result $BASE/mysql-test/r
		MCP mysql-test/r/*.require $BASE/mysql-test/r
		MCP mysql-test/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests
		MCP mysql-test/extra/rpl_tests/*.test $BASE/mysql-test/extra/rpl_tests

		if [ $BASE_SYSTEM != "netware" ] ; then
		chmod a+x $BASE/bin/*

scripts/make_win_bin_dist

+21 −7

Original line number	Diff line number	Diff line
		@@ -126,6 +126,15 @@ if [ -e $DESTDIR ] ; then
		usage
		fi

		# ----------------------------------------------------------------------
		# Adjust target name if needed, release with debug info has another name
		# ----------------------------------------------------------------------

		if [ x"$TARGET" = x"release" -a -f "client/relwithdebinfo/mysql.exe" ]
		then
		TARGET="relwithdebinfo"
		fi

		# ----------------------------------------------------------------------
		# Copy executables, and client DLL (FIXME why?)
		# ----------------------------------------------------------------------
		@@ -137,7 +146,7 @@ mkdir $DESTDIR/bin
		cp client/$TARGET/*.exe $DESTDIR/bin/
		cp extra/$TARGET/*.exe $DESTDIR/bin/
		cp storage/myisam/$TARGET/*.exe $DESTDIR/bin/
		cp server-tools/instance-manager/$TARGET/*.exe $DESTDIR/bin/
		cp server-tools/instance-manager/$TARGET/*.{exe,map,pdb} $DESTDIR/bin/
		cp tests/$TARGET/*.exe $DESTDIR/bin/
		cp libmysql/$TARGET/*.exe $DESTDIR/bin/
		cp libmysql/$TARGET/libmysql.dll $DESTDIR/bin/
		@@ -146,6 +155,8 @@ cp libmysql/$TARGET/libmysql.dll $DESTDIR/bin/
		mv $DESTDIR/bin/comp_err.exe $DESTDIR/bin/comp-err.exe

		cp sql/$TARGET/mysqld.exe $DESTDIR/bin/mysqld$EXE_SUFFIX.exe
		cp sql/$TARGET/mysqld.pdb $DESTDIR/bin/mysqld$EXE_SUFFIX.pdb
		cp sql/$TARGET/mysqld.map $DESTDIR/bin/mysqld$EXE_SUFFIX.map

		if [ x"$PACK_DEBUG" = "" -a -f "sql/debug/mysqld.exe" -o \
		x"$PACK_DEBUG" = "yes" ] ; then
		@@ -343,6 +354,9 @@ done

		cp -pR sql/share $DESTDIR/

		# The SQL initiation code is really expected to be in "share"
		mv $DESTDIR/scripts/*.sql $DESTDIR/share/ \|\| true

		# ----------------------------------------------------------------------
		# Copy other files specified on command line DEST=SOURCE
		# ----------------------------------------------------------------------

sql/set_var.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -877,7 +877,7 @@ SHOW_VAR init_vars[]= {
		#ifdef HAVE_REPLICATION
		{"log_slave_updates", (char*) &opt_log_slave_updates, SHOW_MY_BOOL},
		#endif
		{"log_slow_queries", (char*) &opt_slow_log, SHOW_BOOL},
		{"log_slow_queries", (char*) &opt_slow_log, SHOW_MY_BOOL},
		{sys_log_warnings.name, (char*) &sys_log_warnings, SHOW_SYS},
		{sys_long_query_time.name, (char*) &sys_long_query_time, SHOW_SYS},
		{sys_low_priority_updates.name, (char*) &sys_low_priority_updates, SHOW_SYS},