Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2226 06/06/20 11:11:18 kent@stripped +11 -0
Merge
sql/net_serv.cc
1.92 06/06/20 11:11:12 kent@stripped +0 -4
scripts/make_win_src_distribution.sh
1.55 06/06/20 11:09:53 kent@stripped +1 -2
netware/BUILD/compile-netware-END
1.10 06/06/20 11:08:49 kent@stripped +0 -0
SCCS merged
netware/Makefile.am
1.19 06/06/20 11:08:22 kent@stripped +0 -0
SCCS merged
mysql-test/mysql-test-run.pl
1.125 06/06/20 11:07:17 kent@stripped +0 -4
BUILD/compile-dist
1.12 06/06/20 11:05:28 kent@stripped +0 -0
SCCS merged
configure.in
1.364 06/06/20 11:04:48 kent@stripped +0 -3
tests/mysql_client_test.c
1.195 06/06/20 11:02:49 kent@stripped +0 -0
Auto merged
storage/ndb/Makefile.am
1.18 06/06/20 11:02:48 kent@stripped +0 -0
Auto merged
sql/sql_lex.cc
1.187 06/06/20 11:02:48 kent@stripped +0 -0
Auto merged
sql/item_func.cc
1.301 06/06/20 11:02:48 kent@stripped +0 -0
Auto merged
storage/ndb/Makefile.am
1.13.1.2 06/06/20 11:02:46 kent@stripped +0 -0
Merge rename: ndb/Makefile.am -> storage/ndb/Makefile.am
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: c-6a4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root: /Users/kent/mysql/bk/mysql-5.1/RESYNC
--- 1.54/scripts/make_win_src_distribution.sh 2006-06-09 09:07:26 +02:00
+++ 1.55/scripts/make_win_src_distribution.sh 2006-06-20 11:09:53 +02:00
@@ -1,11 +1,14 @@
#!/bin/sh
+# Terminate loudly on error, we don't want partial package
+set -e
+trap "echo '*** script failed ***'" 0
+
#
# Script to create a Windows src package
#
version=@VERSION@
-export version
CP="cp -p"
DEBUG=0
@@ -74,7 +77,7 @@
echo " --tmp Specify the temporary location"
echo " --suffix Suffix name for the package"
echo " --dirname Directory name to copy files (intermediate)"
- echo " --silent Do not list verbosely files processed"
+ echo " --silent Show no progress information"
echo " --tar Create tar.gz package"
echo " --zip Create zip package"
echo " --help Show this help message"
@@ -140,10 +143,11 @@
# Create a tmp dest directory to copy files
#
-BASE=$TMP/my_win_dist$SUFFIX
+BASE=$TMP/my_win_dist$SUFFIX.$$
+trap "rm -r -f $BASE; echo '*** interrupted ***'; exit 1" 1 2 3 13 15
if [ -d $BASE ] ; then
- print_debug "Destination directory '$BASE' already exists, deleting it"
+ echo "WARNING: Destination directory '$BASE' already exists, deleting it"
rm -r -f $BASE
fi
@@ -199,7 +203,7 @@
print_debug "Creating directory '$arg'"
mkdir $BASE/$arg
fi
- for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp \
+ for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.yy \
README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
*.inc *.test *.result *.pem Moscow_leap des_key_file \
*.vcproj *.sln *.dat *.000001 *.require *.opt
@@ -260,7 +264,7 @@
#
# Create project files for ndb
#
-#make -C $SOURCE/storage/ndb windoze
+#make -C $SOURCE/storage/ndb windoze || true
#
# Input directories to be copied recursively
@@ -334,8 +338,17 @@
# Fix some windows files to avoid compiler warnings
#
-./extra/replace std:: "" < $BASE/sql/sql_yacc.cpp | sed '/^ *switch (yytype)$/ { N; /\n *{$/ { N; /\n *default:$/ { N; /\n *break;$/ { N; /\n *}$/ d; };};};} ' > $BASE/sql/sql_yacc.cpp-new
-mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp
+if [ -x extra/replace ] ; then
+ ./extra/replace std:: "" < $BASE/sql/sql_yacc.cpp | \
+ sed '/^ *switch (yytype)$/ { N; /\n *{$/ { N; /\n *default:$/ { N; /\n *break;$/ { N; /\n *}$/ d; };};};} ' \
+ > $BASE/sql/sql_yacc.cpp-new
+ mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp
+else
+ if [ "$SILENT" = "0" ] ; then
+ echo 'WARNING: "extra/replace" not built, can not filter "sql_yacc.ccp"'
+ echo 'WARNING: to reduce the number of warnings when building'
+ fi
+fi
#
# Search the tree for plain text files and adapt the line end marker
@@ -356,19 +369,23 @@
# Clean up if we did this from a bk tree
#
-if [ -d $BASE/SSL/SCCS ]
-then
- find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
-fi
-find $BASE/ -type d -name .deps -printf " \"%p\"" | xargs rm -r -f
-find $BASE/ -type d -name .libs -printf " \"%p\"" | xargs rm -r -f
+find $BASE -type d \( -name SCCS -o -name .deps -o -name .libs \) -print0 | \
+xargs -0 rm -r -f
rm -r -f "$BASE/mysql-test/var"
#
# Initialize the initial data directory
#
-if [ -f scripts/mysql_install_db ]; then
+if [ ! -f scripts/mysql_install_db ] ; then
+ if [ "$SILENT" = "0" ] ; then
+ echo 'WARNING: "scripts/mysql_install_db" is not built, can not initiate databases'
+ fi
+elif [ ! -f extra/my_print_defaults ]; then
+ if [ "$SILENT" = "0" ] ; then
+ echo 'WARNING: "extra/my_print_defaults" is not built, can not initiate databases'
+ fi
+else
print_debug "Initializing the 'data' directory"
scripts/mysql_install_db --no-defaults --windows --datadir=$BASE/data
if test "$?" = 1
@@ -446,21 +463,15 @@
if [ "$arg" = "tar" ]; then
ZIPFILE1=gnutar
ZIPFILE2=gtar
- OPT=cvf
+ OPT=cf
EXT=".tar"
NEED_COMPRESS=1
- if [ "$SILENT" = "1" ] ; then
- OPT=cf
- fi
else
ZIPFILE1=zip
ZIPFILE2=""
- OPT="-r"
+ OPT="-r -q"
EXT=".zip"
NEED_COMPRESS=0
- if [ "$SILENT" = "1" ] ; then
- OPT="$OPT -q"
- fi
fi
done
}
@@ -520,5 +531,8 @@
print_debug "Removing temporary directory"
rm -r -f $BASE
+
+# No need to report anything if we got here
+trap "" 0
# End of script
--- 1.9/netware/BUILD/compile-netware-END 2006-02-12 20:33:08 +01:00
+++ 1.10/netware/BUILD/compile-netware-END 2006-06-20 11:08:49 +02:00
@@ -21,10 +21,6 @@
# 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
--- 1.124/mysql-test/mysql-test-run.pl 2006-06-18 12:20:26 +02:00
+++ 1.125/mysql-test/mysql-test-run.pl 2006-06-20 11:07:17 +02:00
@@ -290,7 +290,7 @@
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 @@
# 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 @@
}
}
- # 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 @@
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 )
- {
- mtr_add_arg($args, '%s', $_) for (split(' ', $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 @@
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
--- 1.11/BUILD/compile-dist 2006-05-19 13:20:30 +02:00
+++ 1.12/BUILD/compile-dist 2006-06-20 11:05:28 +02:00
@@ -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 && \
--- 1.18/netware/Makefile.am 2006-02-12 20:33:07 +01:00
+++ 1.19/netware/Makefile.am 2006-06-20 11:08:22 +02:00
@@ -31,7 +31,7 @@
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 @@
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 \
--- 1.13.1.1/ndb/Makefile.am 2006-06-17 15:42:12 +02:00
+++ 1.18/storage/ndb/Makefile.am 2006-06-20 11:02:48 +02:00
@@ -1,12 +1,12 @@
SUBDIRS = src tools . include @ndb_opt_subdirs@
DIST_SUBDIRS = src tools include test docs
EXTRA_DIST = config ndbapi-examples
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
dist-hook:
-rm -rf `find $(distdir) -type d -name SCCS`
- -rm -rf `find $(distdir) -type d -name old_files`
-rm -rf `find $(distdir)/ndbapi-examples -name '*.o'`
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" != "." -a "$$subdir" != "include"; then \
@@ -27,5 +27,5 @@
all-windoze-dsp: windoze
find . -name '*.dsp' | grep -v SCCS | xargs unix2dos
- $(top_srcdir)/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
+ $(top_srcdir)/storage/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS`
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.2226) | kent | 20 Jun |
