into  trift2.:/MySQL/M51/push-5.1

    After-merge fix for bug#33536: The target to copy to is now called "$DEST".


scripts/make_binary_distribution.sh:
  After-merge fix for bug#33536: The target to copy to is now called "$DEST".

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/bug33536-5.1


scripts/make_binary_distribution.sh:
  Manual merge of the fix for bug#33536 from 5.0 to 5.1,
  the restructuring of this script makes automerge fail.

into  trift2.:/MySQL/M50/bug33536-5.0


scripts/make_binary_distribution.sh:
  Auto merged

into  mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build


extra/CMakeLists.txt:
  Auto merged
extra/resolveip.c:
  Auto merged
scripts/CMakeLists.txt:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged
scripts/mysql_convert_table_format.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysql_tableinfo.sh~c715458838a2a818:
  Auto merged

  Better Windows support in the scripts directory
mysql_config.pl.in, mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows
Many files in scripts directory:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path


extra/CMakeLists.txt:
  Added target for executable "resolveip"
extra/resolveip.c:
  Exclude Unix specific headers when compiling on Windows
scripts/CMakeLists.txt:
  On Windows, filter Perl scripts and change name from ".sh" to ".pl"
  
    mysql_convert_table_format.sh  mysql_explain_log.sh
    mysql_secure_installation.sh   mysql_tableinfo.sh
    mysqld_multi.sh                mysqldumpslow.sh
    mysqlhotcopy.sh
  
  Do the same for the new Windows specific Perl versions of shell scripts
  
    mysql_config.pl.in             mysql_install_db.pl.in
  
  In CMake, set reasonable values for 'CFLAGS', 'prefix', 'datadir' and so on.
scripts/Makefile.am:
  Include "mysql_config.pl.in" and "mysql_install_db.pl.in" in the source TAR
scripts/make_win_bin_dist:
  Only include explicitly listed scripts from the "scripts" directory
scripts/mysql_convert_table_format.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_explain_log.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_tableinfo.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqld_multi.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqldumpslow.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqlhotcopy.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_config.pl.in:
  New Perl version of Unix shell script, mainly for Windows
scripts/mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows

Fix the code to get the "libgcc" file name so that the failure of Intel's ICC
to provide this information does not cause any problems.

This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler


scripts/make_binary_distribution.sh:
  The (old) code to get the "libgcc" file name does not really work when using Intel's ICC.
  ICC accepts the "--print-libgcc-file" option but ignores it, does not produce any output.
  
  However, ICC tricks automake into taking it for a GCC ("GXX" variable is set, see
  http://www.gnu.org/software/autoconf/manual/html_node/C_002b_002b-Compiler.html#C_002b_002b-Compiler
  and its discussion of the "AC_PROG_CXX" macro).
  
  There are two possible approaches:
  a) Check "$CC" or "$CXX" to tell ICC from GCC, and do not ask ICC for the "libgcc" file name.
  b) Just ask it, but protect that code so that its failure does not cause any damage.
  
  This patch takes the second route:
  1) Put the call "@CC@ ... --print-libgcc-file" into a pipeline, followed by "|| true",
     so that (for the shell semantics) the command cannot fail.
     (ICC will exit non-zero because it is not given a source file.)
  2) Explicitly redirect any error messages.
  3) Do not use the compiler's return code but rather the (non)empty variable to check success.
  4) Ensure that the contents really is a file before taking it as a file name.
  
  Item 1) is especially important when the tool gets a "set -e" (this happens in 5.1, currently)
  which would make the failing compiler call a fatal thing.
  
  This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler

into  trift2.:/MySQL/M51/push-5.1


netware/mysql_test_run.c:
  Auto merged
sql/sp_head.cc:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/merge-5.0

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


client/mysql.cc:
  Auto merged

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

client/mysql.cc:
  BUG#33057, avoid calling strlen() *for every single character* in the client's input

into  zim.(none):/home/bk/mysql-5.1-arch


client/client_priv.h:
  Auto merged
client/mysqlslap.c:
  Auto merged
mysql-test/r/mysqlslap.result:
  Auto merged

  Removed dead option
mysqlslap.c:
  Updates from Paul for help.
  Removed dead option


client/mysqlslap.c:
  Updates from Paul for help.
  Removed dead option
client/client_priv.h:
  Removed dead option

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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1


sql/sql_table.cc:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0

rpl_ndb tests on sapsrv1.


sql/ha_ndbcluster_binlog.cc:
  Try to fix assertion failures at slave shutdown when running
  rpl_ndb tests. If the binlog thread is killed, which happens during
  shutdown, open_tables returns error without setting an error
  in THD. Therefore one can't access thd->main_da.message() if thd->killed.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

Adding the tests cases alone for WL#4165, disabled


mysql-test/t/disabled.def:
  WL#4165 (Prepared statements: validation)
mysql-test/r/ps_ddl.result:
  WL#4165 (Prepared statements: validation)
mysql-test/t/ps_ddl.test:
  WL#4165 (Prepared statements: validation)

- Enable check for symbolic link files.


sql/sql_table.cc:
  Bug#26811 Symbolic links don't work in Windows Vista
  - On systems that support symbolic link files, make sure to check for them.

  Corrected typo


sql/sp_head.cc:
  Corrected typo

  Made sp_head::operator delete() match prototype, added throw()
mysql_test_run.c, mysqld_safe.c:
  Include "mysql_version.h" to get MYSQL_PORT defined


sql/sp_head.cc:
  Made sp_head::operator delete() match prototype, added throw()
netware/mysql_test_run.c:
  Include "mysql_version.h" to get MYSQL_PORT defined
netware/mysqld_safe.c:
  Include "mysql_version.h" to get MYSQL_PORT defined

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1


configure.in:
  null merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1


BitKeeper/triggers/post-commit:
  Auto merged

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0

  Rationalise setting $FROM.


BitKeeper/triggers/post-commit:
  Rationalise setting $FROM.

into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt

into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt


client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/emb_qcache.cc:
  Auto merged
libmysqld/emb_qcache.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/protocol.cc:
  SCCS merged