Commit 08a53d0d authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-opt 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
parents 16e0a4de cd1561d5

scripts/Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ bin_SCRIPTS = @server_scripts@ \ 


noinst_SCRIPTS =	make_binary_distribution \

			make_sharedlib_distribution \

			make_win_src_distribution

			make_win_src_distribution_old



EXTRA_SCRIPTS =		make_binary_distribution.sh \

			make_sharedlib_distribution.sh \

			make_win_src_distribution.sh \

			make_win_src_distribution_old.sh \

			msql2mysql.sh \

			mysql_config.sh \

			mysql_fix_privilege_tables.sh \
@@ -99,7 +99,7 @@ CLEANFILES = @server_scripts@ \ 
			mysql_tableinfo \

			mysql_upgrade_shell \

			mysqld_multi \

			make_win_src_distribution

			make_win_src_distribution_old



# mysqlbug should be distributed built so that people can report build

# failures with it.

scripts/make_win_src_distribution.sh→scripts/make_win_src_distribution_old.sh

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,14 @@ 
# along with this program; if not, write to the Free Software

# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA



# NOTE: This script creates a source TAR and ZIP to be used when

# building using Visual Studio 2003 .Net. To gain more flexibility, a

# new CMake build was added. The new build obsoletes this script, Unix

# and Windows share the same source TAR/ZIP.

# Also note that the old build from source created by this script is

# no longer tested by MySQL AB and may not work. Please use the new

# CMake based build.



# Terminate loudly on error, we don't want partial package

set -e

trap "echo '*** script failed ***'" 0