Merge mysql.com:/home/my/mysql-5.1

into  mysql.com:/home/my/mysql-new


BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
CMakeLists.txt:
  Auto merged
client/get_password.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
cmd-line-utils/readline/bind.c:
  Auto merged
cmd-line-utils/readline/display.c:
  Auto merged
cmd-line-utils/readline/histexpand.c:
  Auto merged
cmd-line-utils/readline/history.c:
  Auto merged
cmd-line-utils/readline/readline.c:
  Auto merged
cmd-line-utils/readline/text.c:
  Auto merged
dbug/user.r:
  Auto merged
extra/yassl/src/handshake.cpp:
  Auto merged
include/config-win.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql/plugin.h:
  Auto merged
include/mysql_com.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/get_password.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/change_user.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/mix2_myisam.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/valgrind.supp:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
mysys/my_atomic.c:
  Auto merged
mysys/my_bit.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
mysys/my_compress.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_delete.c:
  Auto merged
mysys/my_error.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_realloc.c:
  Auto merged
mysys/my_rename.c:
  Auto merged
mysys/my_symlink.c:
  Auto merged
mysys/my_sync.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/events.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
storage/myisam/CMakeLists.txt:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_eval.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_static.c:
  Auto merged
storage/myisam/ft_stopwords.c:
  Auto merged
storage/myisam/ft_test1.c:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_delete_all.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/mi_test3.c:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisam/sp_test.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
dbug/dbug.c:
  Restore to original state in Maria tree
  The big diff comes from a wrong pull from 5.0 -> 5.1 after backporting dbug to 5.0 from 5.1
include/Makefile.am:
  Manual merge
include/my_atomic.h:
  Ignore changes
include/my_base.h:
  Manual merge
include/my_dbug.h:
  Use orginal my_dbug.h from maria tree
include/my_handler.h:
  Manual merge
include/my_sys.h:
  Manual merge
include/myisam.h:
  Manual merge
mysql-test/lib/mtr_report.pl:
  Manual merge
mysql-test/r/myisam.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Manual merge
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
  Manual merge
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
  No changes
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
  Manual merge
mysql-test/t/change_user.test:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge
mysql-test/t/merge.test:
  No changes
mysql-test/t/myisam.test:
  Manual merge
mysys/Makefile.am:
  Manual merge
mysys/array.c:
  Manual merge
mysys/mf_keycache.c:
  Manual merge
mysys/my_getsystime.c:
  Manual merge
mysys/my_handler.c:
  Manual merge
mysys/my_pread.c:
  Manual merge
mysys/safemalloc.c:
  Manual merge
sql/ha_partition.cc:
  Manual merge
sql/handler.cc:
  Manual merge
sql/lex.h:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/set_var.h:
  Manual merge
sql/sql_class.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
sql/sql_show.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
storage/myisam/mi_checksum.c:
  No changes
storage/myisam/mi_extra.c:
  Manual merge
storage/myisam/mi_open.c:
  Manual merge
storage/myisammrg/ha_myisammrg.cc:
  Manual merge
strings/strmake.c:
  No changes

14 files changed, 1394 insertions, 121 deletions

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 6fbfcab72d4..f0db25be79a 100755
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -40,3 +40,38 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tabl
 ADD_CUSTOM_TARGET(GenFixPrivs
                   ALL
                   DEPENDS ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c)
+
+# ----------------------------------------------------------------------
+# Replace some variables @foo@ in the .in/.sh file, and write the new script
+# ----------------------------------------------------------------------
+
+SET(CFLAGS             "-D_WINDOWS ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+SET(prefix             "${CMAKE_INSTALL_PREFIX}/MySQL Server ${MYSQL_BASE_VERSION}")
+SET(sysconfdir          ${prefix})
+SET(bindir              ${prefix}/bin)
+SET(libexecdir          ${prefix}/bin)
+SET(scriptdir           ${prefix}/bin)
+SET(datadir             ${prefix}/share)
+SET(pkgdatadir          ${prefix}/share)
+SET(localstatedir       ${prefix}/data)
+
+CONFIGURE_FILE(mysql_config.pl.in
+               scripts/mysql_config.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysql_convert_table_format.sh
+               scripts/mysql_convert_table_format.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysql_install_db.pl.in
+               scripts/mysql_install_db.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysql_secure_installation.pl.in
+               scripts/mysql_secure_installation.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysqld_multi.sh
+               scripts/mysqld_multi.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysqldumpslow.sh
+               scripts/mysqldumpslow.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysqlhotcopy.sh
+               scripts/mysqlhotcopy.pl ESCAPE_QUOTES @ONLY)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index fc4359fd872..ac43bb7b0a4 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -43,11 +43,14 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			make_sharedlib_distribution.sh \
 			msql2mysql.sh \
 			mysql_config.sh \
+			mysql_config.pl.in \
 			mysql_fix_privilege_tables.sh \
 			mysql_fix_extensions.sh \
 			mysql_install_db.sh \
+			mysql_install_db.pl.in \
 			mysql_setpermission.sh \
 			mysql_secure_installation.sh \
+			mysql_secure_installation.pl.in \
 			mysql_zap.sh \
 			mysqlaccess.sh \
 			mysqlbug.sh \
@@ -87,9 +90,10 @@ CLEANFILES =		@server_scripts@ \
 			mysql_find_rows \
 			mysqlhotcopy \
 			mysqldumpslow \
-			mysql_tableinfo \
 			mysqld_multi
 
+pkgplugindir =		$(pkglibdir)/plugin
+
 # Default same as 'pkgdatadir', but we can override it
 pkgsuppdir =		$(datadir)/@PACKAGE@
 
@@ -137,6 +141,7 @@ SUFFIXES = .sh
 	  -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
 	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
 	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
+	  -e 's!@''pkgplugindir''@!$(pkgplugindir)!g' \
 	  -e 's!@''pkgsuppdir''@!$(pkgsuppdir)!g' \
 	  -e 's!@''sysconfdir''@!$(sysconfdir)!g' \
 	  -e 's!@''mandir''@!$(mandir)!g' \
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 17d5c6ebbaf..0a58f8b8ef1 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -31,6 +31,7 @@
 #    "pkglibdir"     is set to the same as "libdir"
 #    "pkgincludedir" is set to the same as "includedir"
 #    "pkgdatadir"    is set to the same as "datadir"
+#    "pkgplugindir"  is set to "$pkglibdir/plugin"
 #    "pkgsuppdir"    is set to "@prefix@/support-files",
 #                    normally the same as "datadir"
 #
@@ -205,6 +206,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
     pkglibdir=@pkglibdir@ \
     pkgincludedir=@pkgincludedir@ \
     pkgdatadir=@pkgdatadir@ \
+    pkgplugindir=@pkgplugindir@ \
     pkgsuppdir=@pkgsuppdir@ \
     mandir=@mandir@ \
     infodir=@infodir@
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index a5b73ecc6c3..5eb5a5643f1 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -26,8 +26,7 @@ set -e
 # NOTE: Pattern matching with "{..,..}" can't be used, not portable.
 # ----------------------------------------------------------------------
 
-# FIXME FIXME "debug", own build or handled here?
-# FIXME FIXME add way to copy from other builds executables
+# FIXME why "libmysql.dll" installed both in "bin" and "lib/opt"?
 
 usage()
 {
@@ -150,13 +149,16 @@ cp storage/myisam/$TARGET/*.exe                          $DESTDIR/bin/
 cp server-tools/instance-manager/$TARGET/*.{exe,map}     $DESTDIR/bin/
 if [ x"$TARGET" != x"release" ] ; then
   cp server-tools/instance-manager/$TARGET/*.pdb         $DESTDIR/bin/
+  cp client/$TARGET/mysql.pdb                            $DESTDIR/bin/
+  cp client/$TARGET/mysqladmin.pdb                       $DESTDIR/bin/
+  cp client/$TARGET/mysqlbinlog.pdb                      $DESTDIR/bin/
+  cp client/$TARGET/mysqldump.pdb                        $DESTDIR/bin/
+  cp client/$TARGET/mysqlimport.pdb                      $DESTDIR/bin/
+  cp client/$TARGET/mysqlshow.pdb                        $DESTDIR/bin/
 fi
 cp tests/$TARGET/*.exe                                   $DESTDIR/bin/
 cp libmysql/$TARGET/libmysql.dll                         $DESTDIR/bin/
 
-# FIXME really needed?!
-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.map                $DESTDIR/bin/mysqld$EXE_SUFFIX.map
 if [ x"$TARGET" != x"release" ] ; then
@@ -178,10 +180,6 @@ if [ -d win/data ] ; then
   cp -pR win/data $DESTDIR/
 fi
 
-# FIXME maybe a flag to define "release build", or do the
-# check from the calling script that all these are there,
-# and with the correct content.
-
 mkdir $DESTDIR/Docs
 cp Docs/INSTALL-BINARY    $DESTDIR/Docs/
 cp Docs/manual.chm        $DESTDIR/Docs/ || /bin/true
@@ -205,11 +203,13 @@ copy_embedded()
            $DESTDIR/include
   cp libmysqld/libmysqld.def           $DESTDIR/include/
   cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
-  cp libmysqld/$TARGET/mysqlserver.pdb $DESTDIR/Embedded/static/release/
   cp libmysqld/$TARGET/libmysqld.dll   $DESTDIR/Embedded/DLL/release/
   cp libmysqld/$TARGET/libmysqld.exp   $DESTDIR/Embedded/DLL/release/
   cp libmysqld/$TARGET/libmysqld.lib   $DESTDIR/Embedded/DLL/release/
-  cp libmysqld/$TARGET/libmysqld.pdb   $DESTDIR/Embedded/DLL/release/
+  if [ x"$TARGET" != x"release" ] ; then
+    cp libmysqld/$TARGET/mysqlserver.pdb $DESTDIR/Embedded/static/release/
+    cp libmysqld/$TARGET/libmysqld.pdb   $DESTDIR/Embedded/DLL/release/
+  fi
 
   if [ x"$PACK_DEBUG" = x"" -a -f "libmysqld/debug/libmysqld.lib" -o \
        x"$PACK_DEBUG" = x"yes" ] ; then
@@ -276,7 +276,6 @@ cp include/mysql/plugin.h $DESTDIR/include/mysql/
 
 # ----------------------------------------------------------------------
 # Client libraries, and other libraries
-# FIXME why "libmysql.dll" installed both in "bin" and "lib/opt"?
 # ----------------------------------------------------------------------
 
 mkdir -p $DESTDIR/lib/opt
@@ -288,16 +287,31 @@ cp libmysql/$TARGET/libmysql.dll \
    strings/$TARGET/strings.lib \
    zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
 
+if [ x"$TARGET" != x"release" ] ; then
+  cp libmysql/$TARGET/libmysql.pdb \
+     libmysql/$TARGET/mysqlclient.pdb \
+     mysys/$TARGET/mysys.pdb \
+     regex/$TARGET/regex.pdb \
+     strings/$TARGET/strings.pdb \
+     zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/
+fi
+
 if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
      x"$PACK_DEBUG" = x"yes" ] ; then
   mkdir -p $DESTDIR/lib/debug
   cp libmysql/debug/libmysql.dll \
      libmysql/debug/libmysql.lib \
+     libmysql/debug/libmysql.pdb \
      libmysql/debug/mysqlclient.lib \
+     libmysql/debug/mysqlclient.pdb \
      mysys/debug/mysys.lib \
+     mysys/debug/mysys.pdb \
      regex/debug/regex.lib \
+     regex/debug/regex.pdb \
      strings/debug/strings.lib \
-     zlib/debug/zlib.lib $DESTDIR/lib/debug/
+     strings/debug/strings.pdb \
+     zlib/debug/zlib.lib \
+     zlib/debug/zlib.pdb $DESTDIR/lib/debug/
 fi
 
 # ----------------------------------------------------------------------
@@ -316,35 +330,32 @@ if [ -d mysql-test/extra ] ; then
 fi
 
 # ----------------------------------------------------------------------
-# Copy what could be usable in the "scripts" directory. Currently
-# only SQL files, others are Bourne shell scripts or Perl scripts
-# not really usable on Windows.
-#
-# But to be nice to the few Cygwin users we might have in 5.0 we
-# continue to copy the stuff, but don't include it in the WiX install.
+# Copy what could be usable in the "scripts" directory
 # ----------------------------------------------------------------------
 
+mysql_scripts="\
+mysql_config.pl \
+mysql_convert_table_format.pl \
+mysql_install_db.pl \
+mysql_secure_installation.pl \
+mysqld_multi.pl \
+mysqldumpslow.pl \
+mysqlhotcopy.pl \
+"
+
 mkdir -p $DESTDIR/scripts
 
-# Uncomment and remove the for loop in 5.1
-#cp scripts/*.sql $DESTDIR/scripts/
-
-for i in `cd scripts && ls`; do \
-  if echo $i | grep -q '\.sh'; then \
-    cp scripts/$i $DESTDIR/scripts/`echo $i | sed -e 's/\.sh$//'`; \
-  elif [ -d scripts/$i -o $i = Makefile.am -o $i = Makefile.in -o -e scripts/$i.sh ] ; then \
-    : ; \
-  else \
-    cp scripts/$i $DESTDIR/scripts/$i; \
-  fi; \
+for i in $mysql_scripts
+do
+  cp scripts/$i $DESTDIR/scripts/$i
 done
 
 cp -pR sql/share $DESTDIR/
 cp -pR sql-bench $DESTDIR/
 rm -f $DESTDIR/sql-bench/*.sh $DESTDIR/sql-bench/Makefile*
 
-# The SQL initialisation code is really expected to be in "share"
-mv $DESTDIR/scripts/*.sql $DESTDIR/share/ || true
+# The SQL initialisation code is to be in "share"
+cp scripts/*.sql $DESTDIR/share/
 
 # ----------------------------------------------------------------------
 # Clean up from possibly copied SCCS directories
diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in
new file mode 100644
index 00000000000..3ae8baf7db0
--- /dev/null
+++ b/scripts/mysql_config.pl.in
@@ -0,0 +1,285 @@
+#!/usr/bin/perl
+# -*- cperl -*-
+#
+# Copyright (C) 2007 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+##############################################################################
+#
+#  This script reports various configuration settings that may be needed
+#  when using the MySQL client library.
+#
+#  This script try to match the shell script version as close as possible,
+#  but in addition being compatible with ActiveState Perl on Windows.
+#
+#  All unrecognized arguments to this script are passed to mysqld.
+#
+#  NOTE: This script will only be used on Windows until solved how to
+#        handle @LIBS@ and other strings inserted that might contain
+#        several arguments, possibly with spaces in them.
+#
+#  NOTE: This script was deliberately written to be as close to the shell
+#        script as possible, to make the maintenance of both in parallel
+#        easier.
+#
+##############################################################################
+
+use File::Basename;
+use Getopt::Long;
+use Cwd;
+use strict;
+
+my @exclude_cflags =
+  qw/DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX
+     DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS
+     DEXTRA_DEBUG DHAVE_purify O O[0-9] xO[0-9] W[-A-Za-z]*
+     Xa xstrconst xc99=none
+     unroll2 ip mp restrict/;
+
+my @exclude_libs = qw/lmtmalloc static-libcxa i-static static-intel/;
+
+my $cwd = cwd();
+my $basedir;
+
+my $socket  = '@MYSQL_UNIX_ADDR@';
+my $version = '@VERSION@';
+
+sub which
+{
+  my $file = shift;
+
+  my $IFS = $^O eq "MSWin32" ? ";" : ":";
+
+  foreach my $dir ( split($IFS, $ENV{PATH}) )
+  {
+    if ( -f "$dir/$file" or -f "$dir/$file.exe" )
+    {
+      return "$dir/$file";
+    }
+  }
+  print STDERR "which: no $file in ($ENV{PATH})\n";
+  exit 1;
+}
+
+# ----------------------------------------------------------------------
+# If we can find the given directory relatively to where mysql_config is
+# we should use this instead of the incompiled one.
+# This is to ensure that this script also works with the binary MySQL
+# version
+# ----------------------------------------------------------------------
+
+sub fix_path
+{
+  my $default = shift;
+  my @dirs = @_;
+
+  foreach my $dirname ( @dirs )
+  {
+    my $path = "$basedir/$dirname";
+    if ( -d $path )
+    {
+      return $path;
+    }
+  }
+  return $default;
+}
+
+sub get_full_path
+{
+  my $file = shift;
+
+  # if the file is a symlink, try to resolve it
+  if ( $^O ne "MSWin32" and -l $file )
+  {
+    $file = readlink($file);
+  }
+
+  if ( $file =~ m,^/, )
+  {
+    # Do nothing, absolute path
+  }
+  elsif ( $file =~ m,/, )
+  {
+    # Make absolute, and remove "/./" in path
+    $file = "$cwd/$file";
+    $file =~ s,/\./,/,g;
+  }
+  else
+  {
+    # Find in PATH
+    $file = which($file);
+  }
+
+  return $file;
+}
+
+##############################################################################
+#
+#  Form a command line that can handle spaces in paths and arguments
+#
+##############################################################################
+
+sub quote_options {
+  my @cmd;
+  foreach my $opt ( @_ )
+  {
+    next unless $opt;           # If undefined or empty, just skip
+    push(@cmd, "\"$opt\"");       # Quote argument
+  }
+  return join(" ", @cmd);
+}
+
+##############################################################################
+#
+#  Main program
+#
+##############################################################################
+
+my $me = get_full_path($0);
+$basedir = dirname(dirname($me)); # Remove "/bin/mysql_config" part
+
+my $ldata   = '@localstatedir@';
+my $execdir = '@libexecdir@';
+my $bindir  = '@bindir@';
+
+# ----------------------------------------------------------------------
+# If installed, search for the compiled in directory first (might be "lib64")
+# ----------------------------------------------------------------------
+
+my $pkglibdir = fix_path('@pkglibdir@',"libmysql/relwithdebinfo",
+                         "libmysql/release","libmysql/debug","lib/mysql","lib");
+
+my $pkgincludedir = fix_path('@pkgincludedir@', "include/mysql", "include");
+
+# Assume no argument with space in it
+my @ldflags = split(" ",'@LDFLAGS@');
+
+my $port;
+if ( '@MYSQL_TCP_PORT_DEFAULT@' == 0 ) {
+  $port = 0;
+} else {
+  $port = '@MYSQL_TCP_PORT@';
+}
+
+# ----------------------------------------------------------------------
+# Create options 
+# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
+# ----------------------------------------------------------------------
+
+my (@lib_opts,@lib_r_opts,@lib_e_opts);
+if ( $^O eq "MSWin32" )
+{
+  my $linkpath   = "$pkglibdir";
+  # user32 is only needed for debug or embedded
+  my @winlibs = ("wsock32.lib","advapi32.lib","user32.lib");
+  @lib_opts   = ("$linkpath/mysqlclient.lib",@winlibs);
+  @lib_r_opts = @lib_opts;
+  @lib_e_opts = ("$linkpath/mysqlserver.lib",@winlibs);
+}
+else
+{
+  my $linkpath   = "-L$pkglibdir";
+  @lib_opts   = ($linkpath,"-lmysqlclient");
+  @lib_r_opts = ($linkpath,"-lmysqlclient_r");
+  @lib_e_opts = ($linkpath,"-lmysqld");
+}
+
+my $flags;
+$flags->{libs} =
+  [@ldflags,@lib_opts,'@ZLIB_DEPS@','@NON_THREADED_LIBS@','@openssl_libs@','@STATIC_NSS_FLAGS@'];
+$flags->{libs_r} =
+  [@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@'];
+$flags->{embedded_libs} =
+  [@ldflags,@lib_e_opts,'@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@'];
+
+$flags->{include} = ["-I$pkgincludedir"];
+$flags->{cflags}  = [@{$flags->{include}},split(" ",'@CFLAGS@')];
+
+# ----------------------------------------------------------------------
+# Remove some options that a client doesn't have to care about
+# FIXME until we have a --cxxflags, we need to remove -Xa
+#       and -xstrconst to make --cflags usable for Sun Forte C++
+# ----------------------------------------------------------------------
+
+my $filter = join("|", @exclude_cflags);
+my @tmp = @{$flags->{cflags}};          # Copy the flag list
+$flags->{cflags} = [];                  # Clear it
+foreach my $cflag ( @tmp )
+{
+  push(@{$flags->{cflags}}, $cflag) unless $cflag =~ m/^($filter)$/o;
+}
+
+# Same for --libs(_r)
+$filter = join("|", @exclude_libs);
+foreach my $lib_type ( "libs","libs_r","embedded_libs" )
+{
+  my @tmp = @{$flags->{$lib_type}};          # Copy the flag list
+  $flags->{$lib_type} = [];                  # Clear it
+  foreach my $lib ( @tmp )
+  {
+    push(@{$flags->{$lib_type}}, $lib) unless $lib =~ m/^($filter)$/o;
+  }
+}
+
+my $include =       quote_options(@{$flags->{include}});
+my $cflags  =       quote_options(@{$flags->{cflags}});
+my $libs    =       quote_options(@{$flags->{libs}});
+my $libs_r  =       quote_options(@{$flags->{libs_r}});
+my $embedded_libs = quote_options(@{$flags->{embedded_libs}});
+
+##############################################################################
+#
+#  Usage information, output if no option is given
+#
+##############################################################################
+
+sub usage
+{
+  print <<EOF;
+Usage: $0 [OPTIONS]
+Options:
+        --cflags         [$cflags]
+        --include        [$include]
+        --libs           [$libs]
+        --libs_r         [$libs_r]
+        --socket         [$socket]
+        --port           [$port]
+        --version        [$version]
+        --libmysqld-libs [$embedded_libs]
+EOF
+  exit 1;
+}
+
+@ARGV or usage();
+
+##############################################################################
+#
+#  Get options and output the values
+#
+##############################################################################
+
+GetOptions(
+           "cflags"  => sub { print "$cflags\n" },
+           "include" => sub { print "$include\n" },
+           "libs"    => sub { print "$libs\n" },
+           "libs_r"  => sub { print "$libs_r\n" },
+           "socket"  => sub { print "$socket\n" },
+           "port"    => sub { print "$port\n" },
+           "version" => sub { print "$version\n" },
+           "embedded-libs|embedded|libmysqld-libs" =>
+             sub { print "$embedded_libs\n" },
+           ) or usage();
+
+exit 0
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index ae58655ed0f..c16d9bb62e5 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -87,6 +87,8 @@ pkglibdir='@pkglibdir@'
 pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
 fix_path pkglibdir $pkglibdir_rel lib/mysql lib
 
+plugindir='@pkgplugindir@'
+
 pkgincludedir='@pkgincludedir@'
 fix_path pkgincludedir include/mysql include
 
@@ -107,16 +109,29 @@ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
 embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
 
+if [ -r "$pkglibdir/libmygcc.a" ]; then
+  # When linking against the static library with a different version of GCC
+  # from what was used to compile the library, some symbols may not be defined
+  # automatically.  We package the libmygcc.a from the build host, to provide
+  # definitions for those.  Bugs 4921, 19561, 19817, 21158, etc.
+  libs="$libs -lmygcc "
+  libs_r="$libs_r -lmygcc "
+  embedded_libs="$embedded_libs -lmygcc "
+fi
+
 cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
 include="-I$pkgincludedir"
 
 # Remove some options that a client doesn't have to care about
 # FIXME until we have a --cxxflags, we need to remove -Xa
 #       and -xstrconst to make --cflags usable for Sun Forte C++
+# FIXME until we have a --cxxflags, we need to remove -AC99
+#       to make --cflags usable for HP C++ (aCC)
 for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \
               DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
               DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
-              Xa xstrconst "xc99=none" \
+              'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
+              Xa xstrconst "xc99=none" AC99 \
               unroll2 ip mp restrict
 do
   # The first option we might strip will always have a space before it because
@@ -147,6 +162,7 @@ Options:
         --include        [$include]
         --libs           [$libs]
         --libs_r         [$libs_r]
+        --plugindir      [$plugindir]
         --socket         [$socket]
         --port           [$port]
         --version        [$version]
@@ -163,6 +179,7 @@ while test $# -gt 0; do
         --include) echo "$include" ;;
         --libs)    echo "$libs" ;;
         --libs_r)  echo "$libs_r" ;;
+        --plugindir) echo "$plugindir" ;;
         --socket)  echo "$socket" ;;
         --port)    echo "$port" ;;
         --version) echo "$version" ;;
diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh
index 4df3e293303..d15c7b28410 100644
--- a/scripts/mysql_convert_table_format.sh
+++ b/scripts/mysql_convert_table_format.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2002 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
new file mode 100644
index 00000000000..18bd713c041
--- /dev/null
+++ b/scripts/mysql_install_db.pl.in
@@ -0,0 +1,612 @@
+#!/usr/bin/perl
+# -*- cperl -*-
+#
+# Copyright (C) 2007 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+##############################################################################
+#
+#  This scripts creates the MySQL Server system tables.
+#
+#  This script try to match the shell script version as close as possible,
+#  but in addition being compatible with ActiveState Perl on Windows.
+#
+#  All unrecognized arguments to this script are passed to mysqld.
+#
+#  NOTE: This script in 5.0 doesn't really match the shell script
+#        version 100%, it is more close to the 5.1 version.
+#
+#  NOTE: This script was deliberately written to be as close to the shell
+#        script as possible, to make the maintenance of both in parallel
+#        easier.
+#
+##############################################################################
+
+use File::Basename;
+use Getopt::Long;
+use Sys::Hostname;
+use Data::Dumper;
+use strict;
+
+Getopt::Long::Configure("pass_through");
+
+my @args;                       # Argument list filled in
+
+##############################################################################
+#
+#  Usage information
+#
+##############################################################################
+
+sub usage
+{
+  print <<EOF;
+Usage: $0 [OPTIONS]
+  --basedir=path       The path to the MySQL installation directory.
+  --builddir=path      If using --srcdir with out-of-directory builds, you
+                       will need to set this to the location of the build
+                       directory where built files reside.
+  --cross-bootstrap    For internal use.  Used when building the MySQL system
+                       tables on a different host than the target.
+  --datadir=path       The path to the MySQL data directory.
+  --force              Causes mysql_install_db to run even if DNS does not
+                       work.  In that case, grant table entries that normally
+                       use hostnames will use IP addresses.
+  --ldata=path         The path to the MySQL data directory. Same as --datadir.
+  --rpm                For internal use.  This option is used by RPM files
+                       during the MySQL installation process.
+  --skip-name-resolve  Use IP addresses rather than hostnames when creating
+                       grant table entries.  This option can be useful if
+                       your DNS does not work.
+  --srcdir=path        The path to the MySQL source directory.  This option
+                       uses the compiled binaries and support files within the
+                       source tree, useful for if you don't want to install
+                       MySQL yet and just want to create the system tables.
+  --user=user_name     The login username to use for running mysqld.  Files
+                       and directories created by mysqld will be owned by this
+                       user.  You must be root to use this option.  By default
+                       mysqld runs using your current login name and files and
+                       directories that it creates will be owned by you.
+
+All other options are passed to the mysqld program
+
+EOF
+  exit 1;
+}
+
+##############################################################################
+#
+#  Parse an argument list
+#
+#  We only need to pass arguments through to the server if we don't
+#  handle them here.  So, we collect unrecognized options (passed on
+#  the command line) into the args variable.
+#
+##############################################################################
+
+sub parse_arguments
+{
+  my $opt = shift;
+
+  my @saved_ARGV = @ARGV;
+  @ARGV = @_;                           # Set ARGV so GetOptions works
+
+  my $pick_args;
+  if (@ARGV and $ARGV[0] eq 'PICK-ARGS-FROM-ARGV')
+  {
+    $pick_args = 1;
+    shift @ARGV;
+  }
+
+  GetOptions(
+             $opt,
+             "force",
+             "basedir=s",
+             "builddir=s",      # FIXME not documented
+             "srcdir=s",
+             "ldata|datadir=s",
+
+             # Note that the user will be passed to mysqld so that it runs
+             # as 'user' (crucial e.g. if log-bin=/some_other_path/
+             # where a chown of datadir won't help)
+             "user=s",
+
+             "skip-name-resolve",
+             "verbose",
+             "rpm",
+             "help",
+             "defaults-file|defaults-extra-file|no-defaults:s",
+
+             # Used when building the MySQL system tables on a different host than
+             # the target. The platform-independent files that are created in
+             # --datadir on the host can be copied to the target system.
+             #
+             # The most common use for this feature is in the Windows installer
+             # which will take the files from datadir and include them as part of
+             # the install package.  See top-level 'dist-hook' make target.
+             #
+             # --windows is a deprecated alias
+             "cross-bootstrap|windows", # FIXME undocumented, even needed?
+  ) or usage();
+
+  usage() if $opt->{help};
+
+  @args =  @ARGV if $pick_args;
+
+  @ARGV = @saved_ARGV;                  # Set back ARGV
+}
+
+##############################################################################
+#
+#  Try to find a specific file within --basedir which can either be a binary
+#  release or installed source directory and return the path.
+#
+##############################################################################
+
+sub find_in_basedir
+{
+  my $opt   = shift;
+  my $mode  = shift;            # "dir" or "file"
+  my $files = shift;
+
+  foreach my $file ( @{ref($files) ? $files : [$files]} )
+  {
+    foreach my $dir ( @_ )
+    {
+      foreach my $part ( "$file","$file.exe","release/$file.exe",
+                         "debug/$file.exe","relwithdebinfo/$file.exe" )
+      {
+        my $path = "$opt->{basedir}/$dir/$part";
+        if ( -f $path )
+        {
+          return $mode eq "dir" ? dirname($path) : $path;
+        }
+      }
+    }
+  }
+}
+
+##############################################################################
+#
+#  Just a function to write out an error report
+#
+##############################################################################
+
+sub cannot_find_file
+{
+  my $file = shift;
+
+  print "FATAL ERROR: Could not find $file\n";
+  print "\n";
+  print "If you compiled from source, you need to run 'make install' to\n";
+  print "copy the software into the correct location ready for operation.\n";
+  print "\n";
+  print "If you are using a binary release, you must either be at the top\n";
+  print "level of the extracted archive, or pass the --basedir option\n";
+  print "pointing to that location.\n";
+  print "\n";
+
+  exit 1;
+}
+
+##############################################################################
+#
+#  Form a command line that can handle spaces in paths and arguments
+#
+##############################################################################
+
+# FIXME this backslash escaping needed if using '"..."' ?
+# This regexp makes sure that any special chars are quoted,
+# so the arg gets passed exactly to the server.
+# XXX: This is broken; true fix requires using eval and proper
+# quoting of every single arg ($opt->{basedir}, $opt->{ldata}, etc.)
+#  join(" ", map {s/([^\w\_\.\-])/\\$1/g}
+
+sub quote_options {
+  my @cmd;
+  foreach my $opt ( @_ )
+  {
+    next unless $opt;           # If undefined or empty, just skip
+    push(@cmd, "\"$opt\"");     # Quote argument
+  }
+  return join(" ", @cmd);
+}
+
+##############################################################################
+#
+#  Ok, let's go.  We first need to parse arguments which are required by
+#  my_print_defaults so that we can execute it first, then later re-parse
+#  the command line to add any extra bits that we need.
+#
+##############################################################################
+
+my $opt = {};
+parse_arguments($opt, 'PICK-ARGS-FROM-ARGV', @ARGV);
+
+# ----------------------------------------------------------------------
+# We can now find my_print_defaults.  This script supports:
+#
+#   --srcdir=path pointing to compiled source tree
+#   --basedir=path pointing to installed binary location
+#
+# or default to compiled-in locations.
+# ----------------------------------------------------------------------
+
+my $print_defaults;
+
+if ( $opt->{srcdir} and $opt->{basedir} )
+{
+  error("Specify either --basedir or --srcdir, not both");
+}
+if ( $opt->{srcdir} )
+{
+  $opt->{builddir} = $opt->{srcdir} unless $opt->{builddir};
+  $print_defaults = "$opt->{builddir}/extra/my_print_defaults";
+}
+elsif ( $opt->{basedir} )
+{
+  $print_defaults = find_in_basedir($opt,"file","my_print_defaults","bin","extra");
+}
+else
+{
+  $print_defaults='@bindir@/my_print_defaults';
+}
+
+-x $print_defaults or -f "$print_defaults.exe"
+  or cannot_find_file($print_defaults);
+
+# ----------------------------------------------------------------------
+# Now we can get arguments from the groups [mysqld] and [mysql_install_db]
+# in the my.cfg file, then re-run to merge with command line arguments.
+# ----------------------------------------------------------------------
+
+my @default_options;
+my $cmd = quote_options($print_defaults,$opt->{'defaults-file'},
+                        "mysqld","mysql_install_db");
+open(PIPE, "$cmd |") or error($opt,"can't run $cmd: $!");
+while ( <PIPE> )
+{
+  chomp;
+  next unless /\S/;
+  push(@default_options, $_);
+}
+close PIPE;
+$opt = {};                              # Reset the arguments FIXME ?
+parse_arguments($opt, @default_options);
+parse_arguments($opt, 'PICK-ARGS-FROM-ARGV', @ARGV);
+
+# ----------------------------------------------------------------------
+# Configure paths to support files
+# ----------------------------------------------------------------------
+
+# FIXME $extra_bindir is not used
+my ($bindir,$extra_bindir,$mysqld,$pkgdatadir,$mysqld_opt,$scriptdir);
+
+if ( $opt->{srcdir} )
+{
+  $opt->{basedir} = $opt->{builddir};
+  $bindir         = "$opt->{basedir}/client";
+  $extra_bindir   = "$opt->{basedir}/extra";
+  $mysqld         = "$opt->{basedir}/sql/mysqld";
+  $mysqld_opt     = "--language=$opt->{srcdir}/sql/share/english";
+  $pkgdatadir     = "$opt->{srcdir}/scripts";
+  $scriptdir      = "$opt->{srcdir}/scripts";
+}
+elsif ( $opt->{basedir} )
+{
+  $bindir         = "$opt->{basedir}/bin";
+  $extra_bindir   = $bindir;
+  $mysqld         = find_in_basedir($opt,"file",["mysqld-nt","mysqld"],
+                                    "libexec","sbin","bin") ||  # ,"sql"
+                    find_in_basedir($opt,"file","mysqld-nt",
+                                  "bin");  # ,"sql"
+  $pkgdatadir     = find_in_basedir($opt,"dir","fill_help_tables.sql",
+                                    "share","share/mysql");  # ,"scripts"
+  $scriptdir      = "$opt->{basedir}/scripts";
+}
+else
+{
+  $opt->{basedir} = '@prefix@';
+  $bindir         = '@bindir@';
+  $extra_bindir   = $bindir;
+  $mysqld         = '@libexecdir@/mysqld';
+  $pkgdatadir     = '@pkgdatadir@';
+  $scriptdir      = '@scriptdir@';
+}
+
+unless ( $opt->{ldata} )
+{
+  $opt->{ldata} = '@localstatedir@';
+}
+
+if ( $opt->{srcdir} )
+{
+  $pkgdatadir = "$opt->{srcdir}/scripts";
+}
+
+# ----------------------------------------------------------------------
+# Set up paths to SQL scripts required for bootstrap
+# ----------------------------------------------------------------------
+
+my $fill_help_tables     = "$pkgdatadir/fill_help_tables.sql";
+my $create_system_tables = "$pkgdatadir/mysql_system_tables.sql";
+my $fill_system_tables   = "$pkgdatadir/mysql_system_tables_data.sql";
+
+foreach my $f ( $fill_help_tables,$create_system_tables,$fill_system_tables )
+{
+  -f $f or cannot_find_file($f);
+}
+
+-x $mysqld or -f "$mysqld.exe" or cannot_find_file($mysqld);
+# Try to determine the hostname
+my $hostname = hostname();
+
+# ----------------------------------------------------------------------
+# Check if hostname is valid
+# ----------------------------------------------------------------------
+
+my $resolved;
+if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} )
+{
+  my $resolveip;
+
+  $resolved = `$resolveip $hostname 2>&1`;
+  if ( $? != 0 )
+  {
+    $resolved=`$resolveip localhost 2>&1`;
+    if ( $? != 0 )
+    {
+      error($opt,
+            "Neither host '$hostname' nor 'localhost' could be looked up with",
+            "$bindir/resolveip",
+            "Please configure the 'hostname' command to return a correct",
+            "hostname.",
+            "If you want to solve this at a later stage, restart this script",
+            "with the --force option");
+    }
+    warning($opt,
+            "The host '$hostname' could not be looked up with resolveip.",
+            "This probably means that your libc libraries are not 100 % compatible",
+            "with this binary MySQL version. The MySQL daemon, mysqld, should work",
+            "normally with the exception that host name resolving will not work.",
+            "This means that you should use IP addresses instead of hostnames",
+            "when specifying MySQL privileges !");
+  }
+}
+
+# FIXME what does this really mean....
+if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
+{
+  $hostname = (split(' ', $resolved))[5];
+}
+
+# ----------------------------------------------------------------------
+# Create database directories mysql & test
+# ----------------------------------------------------------------------
+
+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
+{
+  # FIXME not really the same as original "mkdir -p", but ok?
+  mkdir($dir, 0700) unless -d $dir;
+  chown($opt->{user}, $dir) if -w "/" and !$opt->{user};
+}
+
+push(@args, "--user=$opt->{user}") if $opt->{user};
+
+# ----------------------------------------------------------------------
+# Configure mysqld command line
+# ----------------------------------------------------------------------
+
+# FIXME use --init-file instead of --bootstrap ?!
+
+my $mysqld_bootstrap = $ENV{MYSQLD_BOOTSTRAP} || $mysqld;
+my $mysqld_install_cmd_line = quote_options($mysqld_bootstrap,
+                                            $opt->{'defaults-file'},
+                                            $mysqld_opt,
+                                            "--bootstrap",
+                                            "--basedir=$opt->{basedir}",
+                                            "--datadir=$opt->{ldata}",
+                                            "--skip-innodb",
+                                            "--skip-bdb",
+                                            "--skip-ndbcluster",
+                                            "--max_allowed_packet=8M",
+                                            "--net_buffer_length=16K",
+                                            @args,
+                                          );
+
+# ----------------------------------------------------------------------
+# Create the system and help tables by passing them to "mysqld --bootstrap"
+# ----------------------------------------------------------------------
+
+report_verbose_wait($opt,"Installing MySQL system tables...");
+
+open(SQL, $create_system_tables)
+  or error($opt,"can't open $create_system_tables for reading: $!");
+# FIXME  > /dev/null ?
+if ( open(PIPE, "| $mysqld_install_cmd_line") )
+{
+  print PIPE "use mysql;\n";
+  while ( <SQL> )
+  {
+    # When doing a "cross bootstrap" install, no reference to the current
+    # host should be added to the system tables.  So we filter out any
+    # lines which contain the current host name.
+    next if $opt->{'cross-bootstrap'} and /\@current_hostname/;
+
+    print PIPE $_;
+  }
+  close PIPE;
+  close SQL;
+
+  report_verbose($opt,"OK");
+
+  # ----------------------------------------------------------------------
+  # Pipe fill_help_tables.sql to "mysqld --bootstrap"
+  # ----------------------------------------------------------------------
+
+  report_verbose_wait($opt,"Filling help tables...");
+  open(SQL, $fill_help_tables)
+    or error($opt,"can't open $fill_help_tables for reading: $!");
+  # FIXME  > /dev/null ?
+  if ( open(PIPE, "| $mysqld_install_cmd_line") )
+  {
+    print PIPE "use mysql;\n";
+    while ( <SQL> )
+    {
+      print PIPE $_;
+    }
+    close PIPE;
+    close SQL;
+
+    report_verbose($opt,"OK");
+  }
+  else
+  {
+    warning($opt,"HELP FILES ARE NOT COMPLETELY INSTALLED!",
+                 "The \"HELP\" command might not work properly");
+  }
+
+  report_verbose($opt,"To start mysqld at boot time you have to copy",
+                      "support-files/mysql.server to the right place " .
+                      "for your system");
+
+  if ( !$opt->{'cross-bootstrap'} )
+  {
+    # This is not a true installation on a running system.  The end user must
+    # set a password after installing the data files on the real host system.
+    # At this point, there is no end user, so it does not make sense to print
+    # this reminder.
+    report($opt,
+           "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !",
+           "To do so, start the server, then issue the following commands:",
+           "",
+           "  $bindir/mysqladmin -u root password 'new-password'",
+           "  $bindir/mysqladmin -u root -h $hostname password 'new-password'",
+           "",
+           "Alternatively you can run:",
+           "",
+           "  $bindir/mysql_secure_installation",
+           "",
+           "which will also give you the option of removing the test",
+           "databases and anonymous user created by default.  This is",
+           "strongly recommended for production servers.",
+           "",
+           "See the manual for more instructions.");
+
+    if ( !$opt->{rpm} )
+    {
+      report($opt,
+             "You can start the MySQL daemon with:",
+             "",
+             "  cd " . '@prefix@' . " ; $bindir/mysqld_safe &",
+             "",
+             "You can test the MySQL daemon with mysql-test-run.pl",
+             "",
+             "  cd mysql-test ; perl mysql-test-run.pl");
+    }
+    report($opt,
+           "Please report any problems with the " . '@scriptdir@' . "/mysqlbug script!",
+           "",
+           "The latest information about MySQL is available on the web at",
+           "",
+           "  http://www.mysql.com",
+           "",
+           "Support MySQL by buying support/licenses at http://shop.mysql.com");
+  }
+  exit 0
+}
+else
+{
+  error($opt,
+        "Installation of system tables failed!",
+         "",
+        "Examine the logs in $opt->{ldata} for more information.",
+        "You can try to start the mysqld daemon with:",
+        "$mysqld --skip-grant &",
+        "and use the command line tool",
+        "$bindir/mysql to connect to the mysql",
+        "database and look at the grant tables:",
+        "",
+        "shell> $bindir/mysql -u root mysql",
+        "mysql> show tables",
+        "",
+        "Try 'mysqld --help' if you have problems with paths. Using --log",
+        "gives you a log in $opt->{ldata} that may be helpful.",
+        "",
+        "The latest information about MySQL is available on the web at",
+        "http://www.mysql.com",
+        "Please consult the MySQL manual section: 'Problems running mysql_install_db',",
+        "and the manual section that describes problems on your OS.",
+        "Another information source is the MySQL email archive.",
+        "Please check all of the above before mailing us!",
+        "And if you do mail us, you MUST use the " . '@scriptdir@' . "/mysqlbug script!")
+}
+
+##############################################################################
+#
+#  Misc
+#
+##############################################################################
+
+sub report_verbose
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  report_verbose_wait($opt, $text, @_);
+  print "\n\n";
+}
+
+sub report_verbose_wait
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  if ( $opt->{verbose} or (!$opt->{rpm} and !$opt->{'cross-bootstrap'}) )
+  {
+    print "$text";
+    map {print "\n$_"} @_;
+  }
+}
+
+sub report
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  print "$text\n";
+  map {print "$_\n"} @_;
+  print "\n";
+}
+
+sub error
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  print "FATAL ERROR: $text\n";
+  map {print "$_\n"} @_;
+  exit 1;
+}
+
+sub warning
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  print "WARNING: $text\n";
+  map {print "$_\n"} @_;
+  print "\n";
+}
diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in
new file mode 100755
index 00000000000..4eeb50e6d2f
--- /dev/null
+++ b/scripts/mysql_secure_installation.pl.in
@@ -0,0 +1,352 @@
+#!/usr/bin/perl
+# -*- cperl -*-
+#
+# Copyright (C) 2002 MySQL AB and Jeremy Cole
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+use Fcntl;
+use strict;
+
+my $config  = ".my.cnf.$$";
+my $command = ".mysql.$$";
+my $hadpass = 0;
+
+# FIXME
+# trap "interrupt" 2
+
+my $rootpass = "";
+
+sub echo_on {
+  if ($^O eq 'MSWin32') {
+    ReadMode('normal');
+  } else {
+    system("stty echo");
+  }
+}
+
+sub echo_off {
+  if ($^O eq 'MSWin32') {
+    ReadMode('noecho');
+  } else {
+    system("stty -echo");
+  }
+}
+
+sub write_file {
+  my $file = shift;
+  -f $file or die "ERROR: file is missing \"$file\": $!";
+  open(FILE, ">$file") or die "ERROR: can't write to file \"$file\": $!";
+  foreach my $line ( @_ ) {
+    print FILE $line, "\n";             # Add EOL char
+  }
+  close FILE;
+}
+
+sub prepare {
+  foreach my $file ( $config, $command ) {
+    next if -f $file;                   # Already exists
+    local *FILE;
+    sysopen(FILE, $file, O_CREAT, 0600)
+      or die "ERROR: can't create $file: $!";
+    close FILE;
+  }
+}
+
+sub do_query {
+  my $query   = shift;
+  write_file($command, $query);
+  system("mysql --defaults-file=$config < $command");
+  return $?;
+}
+
+sub make_config {
+  my $password = shift;
+
+  write_file($config,
+             "# mysql_secure_installation config file",
+             "[mysql]",
+             "user=root",
+             "password=$rootpass");
+}
+
+sub get_root_password {
+  my $status = 1;
+  while ( $status == 1 ) {
+    echo_off();
+    print "Enter current password for root (enter for none): ";
+    my $password = <STDIN>;
+    echo_on();
+    if ( $password ) {
+      $hadpass = 1;
+    } else {
+      $hadpass = 0;
+    }
+    $rootpass = $password;
+    make_config($rootpass);
+    do_query("");
+    $status = $?;
+  }
+  print "OK, successfully used password, moving on...\n\n";
+}
+
+sub set_root_password {
+  echo_off();
+  print "New password: ";
+  my $password1 = <STDIN>;
+  print "\nRe-enter new password: ";
+  my $password2 = <STDIN>;
+  print "\n";
+  echo_on();
+
+  if ( $password1 eq $password2 ) {
+    print "Sorry, passwords do not match.\n\n";
+    return 1;
+  }
+
+  if ( !$password1 ) {
+    print "Sorry, you can't use an empty password here.\n\n";
+    return 1;
+  }
+
+  do_query("UPDATE mysql.user SET Password=PASSWORD('$password1') WHERE User='root';");
+  if ( $? == 0 ) {
+    print "Password updated successfully!\n";
+    print "Reloading privilege tables..\n";
+    if ( !reload_privilege_tables() ) {
+      exit 1;
+    }
+    print "\n";
+    $rootpass = $password1;
+    make_config($rootpass);
+  } else {
+    print "Password update failed!\n";
+    exit 1;
+  }
+
+  return 0;
+}
+
+sub remove_anonymous_users {
+  do_query("DELETE FROM mysql.user WHERE User='';");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+  } else {
+    print " ... Failed!\n";
+    exit 1;
+  }
+
+  return 0;
+}
+
+sub remove_remote_root {
+  do_query("DELETE FROM mysql.user WHERE User='root' AND Host!='localhost';");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+  } else {
+    print " ... Failed!\n";
+  }
+}
+
+sub remove_test_database {
+  print " - Dropping test database...\n";
+  do_query("DROP DATABASE test;");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+  } else {
+    print " ... Failed!  Not critical, keep moving...\n";
+  }
+
+  print " - Removing privileges on test database...\n";
+  do_query("DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+  } else {
+    print " ... Failed!  Not critical, keep moving...\n";
+  }
+
+  return 0;
+}
+
+sub reload_privilege_tables {
+  do_query("FLUSH PRIVILEGES;");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+    return 0;
+  } else {
+    print " ... Failed!\n";
+    return 1;
+  }
+}
+
+sub interrupt {
+  print "\nAborting!\n\n";
+  cleanup();
+  echo_on();
+  exit 1;
+}
+
+sub cleanup {
+  print "Cleaning up...\n";
+  unlink($config,$command);
+}
+
+
+# The actual script starts here
+
+prepare();
+
+print <<HERE;
+
+
+
+NOTE: RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MySQL
+      SERVERS IN PRODUCTION USE!  PLEASE READ EACH STEP CAREFULLY!
+
+In order to log into MySQL to secure it, we'll need the current
+password for the root user.  If you've just installed MySQL, and
+you haven't set the root password yet, the password will be blank,
+so you should just press enter here.
+
+HERE
+
+get_root_password();
+
+
+#
+# Set the root password
+#
+
+print "Setting the root password ensures that nobody can log into the MySQL\n";
+print "root user without the proper authorisation.\n\n";
+
+if ( $hadpass == 0 ) {
+  print "Set root password? [Y/n] ";
+} else {
+  print "You already have a root password set, so you can safely answer 'n'.\n\n";
+  print "Change the root password? [Y/n] ";
+}
+
+my $reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  my $status = 1;
+  while ( $status == 1 ) {
+    set_root_password();
+    $status = $?;
+  }
+}
+print "\n";
+
+
+#
+# Remove anonymous users
+#
+
+print <<HERE;
+By default, a MySQL installation has an anonymous user, allowing anyone
+to log into MySQL without having to have a user account created for
+them.  This is intended only for testing, and to make the installation
+go a bit smoother.  You should remove them before moving into a
+production environment.
+
+HERE
+
+print "Remove anonymous users? [Y/n] ";
+$reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  remove_anonymous_users();
+}
+print "\n";
+
+
+#
+# Disallow remote root login
+#
+
+print <<HERE;
+Normally, root should only be allowed to connect from 'localhost'.  This
+ensures that someone cannot guess at the root password from the network.
+
+HERE
+
+print "Disallow root login remotely? [Y/n] ";
+$reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  remove_remote_root();
+}
+print "\n";
+
+
+#
+# Remove test database
+#
+
+print <<HERE;
+By default, MySQL comes with a database named 'test' that anyone can
+access.  This is also intended only for testing, and should be removed
+before moving into a production environment.
+
+HERE
+
+print "Remove test database and access to it? [Y/n] ";
+$reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  remove_test_database();
+}
+print "\n";
+
+
+#
+# Reload privilege tables
+#
+
+print <<HERE;
+Reloading the privilege tables will ensure that all changes made so far
+will take effect immediately.
+
+HERE
+
+print "Reload privilege tables now? [Y/n] ";
+$reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  reload_privilege_tables();
+}
+print "\n";
+
+cleanup();
+
+print <<HERE;
+
+
+
+All done!  If you've completed all of the above steps, your MySQL
+installation should now be secure.
+
+Thanks for using MySQL!
+
+
+HERE
+
+
+
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index 7ca35ae0752..fdab9601129 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -60,7 +60,7 @@ CREATE TABLE IF NOT EXISTS time_zone_transition_type (   Time_zone_id int unsign
 CREATE TABLE IF NOT EXISTS time_zone_leap_second (   Transition_time bigint signed NOT NULL, Correction int signed NOT NULL, PRIMARY KEY TranTime (Transition_time) ) engine=MyISAM CHARACTER SET utf8   comment='Leap seconds information for time zones';
 
 
-CREATE TABLE IF NOT EXISTS proc (db char(64) collate utf8_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum( 'CONTAINS_SQL', 'NO_SQL', 'READS_SQL_DATA', 'MODIFIES_SQL_DATA') DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob NOT NULL, returns longblob DEFAULT '' NOT NULL, body longblob NOT NULL, definer char(77) collate utf8_bin DEFAULT '' NOT NULL, created timestamp, modified timestamp, sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'NOT_USED', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE') DEFAULT '' NOT NULL, comment char(64) collate utf8_bin DEFAULT '' NOT NULL, character_set_client char(32) collate utf8_bin, collation_connection char(32) collate utf8_bin, db_collation char(32) collate utf8_bin, body_utf8 longblob, PRIMARY KEY (db,name,type)) engine=MyISAM character set utf8 comment='Stored Procedures';
+CREATE TABLE IF NOT EXISTS proc (db char(64) collate utf8_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum( 'CONTAINS_SQL', 'NO_SQL', 'READS_SQL_DATA', 'MODIFIES_SQL_DATA') DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob NOT NULL, returns longblob DEFAULT '' NOT NULL, body longblob NOT NULL, definer char(77) collate utf8_bin DEFAULT '' NOT NULL, created timestamp, modified timestamp, sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'NOT_USED', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE', 'NO_ENGINE_SUBSTITUTION', 'PAD_CHAR_TO_FULL_LENGTH') DEFAULT '' NOT NULL, comment char(64) collate utf8_bin DEFAULT '' NOT NULL, character_set_client char(32) collate utf8_bin, collation_connection char(32) collate utf8_bin, db_collation char(32) collate utf8_bin, body_utf8 longblob, PRIMARY KEY (db,name,type)) engine=MyISAM character set utf8 comment='Stored Procedures';
 
 CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) binary DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp(14), PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin   comment='Procedure privileges';
 
@@ -80,7 +80,7 @@ PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
 
-CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode  set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', originator int(10) NOT NULL, time_zone char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', character_set_client char(32) collate utf8_bin, collation_connection char(32) collate utf8_bin, db_collation char(32) collate utf8_bin, body_utf8 longblob, PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
+CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode  set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', originator int(10) NOT NULL, time_zone char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', character_set_client char(32) collate utf8_bin, collation_connection char(32) collate utf8_bin, db_collation char(32) collate utf8_bin, body_utf8 longblob, PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
 
 
 CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index a43964bf09a..e2bdd668c0f 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -375,7 +375,9 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
                             'ERROR_FOR_DIVISION_BY_ZERO',
                             'TRADITIONAL',
                             'NO_AUTO_CREATE_USER',
-                            'HIGH_NOT_PRECEDENCE'
+                            'HIGH_NOT_PRECEDENCE',
+                            'NO_ENGINE_SUBSTITUTION',
+                            'PAD_CHAR_TO_FULL_LENGTH'
                             ) DEFAULT '' NOT NULL,
                  DEFAULT CHARACTER SET utf8;
 
@@ -461,7 +463,9 @@ ALTER TABLE event ADD sql_mode
                             'ERROR_FOR_DIVISION_BY_ZERO',
                             'TRADITIONAL',
                             'NO_AUTO_CREATE_USER',
-                            'HIGH_NOT_PRECEDENCE'
+                            'HIGH_NOT_PRECEDENCE',
+                            'NO_ENGINE_SUBSTITUTION',
+                            'PAD_CHAR_TO_FULL_LENGTH'
                             ) DEFAULT '' NOT NULL AFTER on_completion;
 ALTER TABLE event MODIFY name char(64) CHARACTER SET utf8 NOT NULL default '';
 ALTER TABLE event ADD COLUMN originator INT(10) NOT NULL AFTER comment;
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 92cfbe3ef22..3cb4665eb1c 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 
 use Getopt::Long;
 use POSIX qw(strftime);
diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh
index ff82a35ec3f..f05761bb837 100644
--- a/scripts/mysqldumpslow.sh
+++ b/scripts/mysqldumpslow.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # mysqldumpslow - parse and summarize the MySQL slow query log
 
 # Original version by Tim Bunce, sometime in 2000.
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index 6ad5c77b954..4819f512a65 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/perl
 
 use strict;
 use Getopt::Long;
@@ -39,7 +39,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome.
 
 # Documentation continued at end of file
 
-my $VERSION = "1.22";
+my $VERSION = "1.23";
 
 my $opt_tmpdir = $ENV{TMPDIR} || "/tmp";
 
@@ -132,7 +132,6 @@ GetOptions( \%opt,
 #   'target'  - destination directory of the copy
 #   'tables'  - array-ref to list of tables in the db
 #   'files'   - array-ref to list of files to be copied
-#               (RAID files look like 'nn/name.MYD')
 #   'index'   - array-ref to list of indexes to be copied
 #
 
@@ -263,7 +262,6 @@ my $hc_locks = "";
 my $hc_tables = "";
 my $num_tables = 0;
 my $num_files = 0;
-my $raid_dir_regex = '[A-Za-z0-9]{2}';
 
 foreach my $rdb ( @db_desc ) {
     my $db = $rdb->{src};
@@ -292,20 +290,12 @@ foreach my $rdb ( @db_desc ) {
       or die "Cannot open dir '$db_dir': $!";
 
     my %db_files;
-    my @raid_dir = ();
 
     while ( defined( my $name = readdir DBDIR ) ) {
-	if ( $name =~ /^$raid_dir_regex$/ && -d "$db_dir/$name" ) {
-	    push @raid_dir, $name;
-	}
-	else {
-	    $db_files{$name} = $1 if ( $name =~ /(.+)\.\w+$/ );
-        }
+        $db_files{$name} = $1 if ( $name =~ /(.+)\.\w+$/ );
     }
     closedir( DBDIR );
 
-    scan_raid_dir( \%db_files, $db_dir, @raid_dir );
-
     unless( keys %db_files ) {
 	warn "'$db' is an empty database\n";
     }
@@ -336,8 +326,6 @@ foreach my $rdb ( @db_desc ) {
     my @hc_tables = map { quote_names("$db.$_") } @dbh_tables;
     $rdb->{tables} = [ @hc_tables ];
 
-    $rdb->{raid_dirs} = [ get_raid_dirs( $rdb->{files} ) ];
-
     $hc_locks .= ", "  if ( length $hc_locks && @hc_tables );
     $hc_locks .= join ", ", map { "$_ READ" } @hc_tables;
     $hc_tables .= ", "  if ( length $hc_tables && @hc_tables );
@@ -411,27 +399,24 @@ if ($opt{method} =~ /^cp\b/)
 retire_directory( @existing ) if @existing && !$opt{addtodest};
 
 foreach my $rdb ( @db_desc ) {
-    foreach my $td ( '', @{$rdb->{raid_dirs}} ) {
-
-	my $tgt_dirpath = "$rdb->{target}/$td";
-	# Remove trailing slashes (needed for Mac OS X)
-    	substr($tgt_dirpath, 1) =~ s|/+$||;
-	if ( $opt{dryrun} ) {
-	    print "mkdir $tgt_dirpath, 0750\n";
-	}
-	elsif ($opt{method} =~ /^scp\b/) {
-	    ## assume it's there?
-	    ## ...
-	}
-	else {
-	    mkdir($tgt_dirpath, 0750) or die "Can't create '$tgt_dirpath': $!\n"
-		unless -d $tgt_dirpath;
-	     if ($^O !~ m/^(NetWare)$/)  
-    	    {
-	    my @f_info= stat "$datadir/$rdb->{src}";
-	    chown $f_info[4], $f_info[5], $tgt_dirpath;
-    	    }
-	}
+    my $tgt_dirpath = "$rdb->{target}";
+    # Remove trailing slashes (needed for Mac OS X)
+    substr($tgt_dirpath, 1) =~ s|/+$||;
+    if ( $opt{dryrun} ) {
+        print "mkdir $tgt_dirpath, 0750\n";
+    }
+    elsif ($opt{method} =~ /^scp\b/) {
+        ## assume it's there?
+        ## ...
+    }
+    else {
+        mkdir($tgt_dirpath, 0750) or die "Can't create '$tgt_dirpath': $!\n"
+            unless -d $tgt_dirpath;
+        if ($^O !~ m/^(NetWare)$/)  
+        {
+            my @f_info= stat "$datadir/$rdb->{src}";
+            chown $f_info[4], $f_info[5], $tgt_dirpath;
+        }
     }
 }
 
@@ -489,7 +474,7 @@ foreach my $rdb ( @db_desc )
   my @files = map { "$datadir/$rdb->{src}/$_" } @{$rdb->{files}};
   next unless @files;
   
-  eval { copy_files($opt{method}, \@files, $rdb->{target}, $rdb->{raid_dirs} ); };
+  eval { copy_files($opt{method}, \@files, $rdb->{target}); };
   push @failed, "$rdb->{src} -> $rdb->{target} failed: $@"
     if ( $@ );
   
@@ -582,7 +567,7 @@ exit 0;
 # ---
 
 sub copy_files {
-    my ($method, $files, $target, $raid_dirs) = @_;
+    my ($method, $files, $target) = @_;
     my @cmd;
     print "Copying ".@$files." files...\n" unless $opt{quiet};
 
@@ -603,15 +588,8 @@ sub copy_files {
 	# add recursive option for scp
 	$cp.= " -r" if $^O =~ /m^(solaris|linux|freebsd|darwin)$/ && $method =~ /^scp\b/;
 
-	my @non_raid = map { "'$_'" } grep { ! m:/$raid_dir_regex/[^/]+$: } @$files;
-
-	# add files to copy and the destination directory
-	safe_system( $cp, @non_raid, "'$target'" ) if (@non_raid);
-	
-	foreach my $rd ( @$raid_dirs ) {
-	    my @raid = map { "'$_'" } grep { m:$rd/: } @$files;
-	    safe_system( $cp, @raid, "'$target'/$rd" ) if ( @raid );
-	}
+	# perform the actual copy
+	safe_system( $cp, (map { "'$_'" } @$files), "'$target'" );
     }
     else
     {
@@ -755,7 +733,7 @@ sub record_log_pos {
 	      = @{$row_hash}{ qw / Master_Host Log_File Pos / };
 	} else {
 	    ($master_host, $log_file, $log_pos ) 
-	      = @{$row_hash}{ qw / Master_Host Master_Log_File Read_Master_Log_Pos / };
+	      = @{$row_hash}{ qw / Master_Host Relay_Master_Log_File Exec_Master_Log_Pos / };
 	}
 	my $hostname = hostname();
 	
@@ -789,35 +767,6 @@ sub get_row_hash {
   return $sth->fetchrow_hashref();
 }
 
-sub scan_raid_dir {
-    my ( $r_db_files, $data_dir, @raid_dir ) = @_;
-
-    local(*RAID_DIR);
-    
-    foreach my $rd ( @raid_dir ) {
-
-	opendir(RAID_DIR, "$data_dir/$rd" ) 
-	    or die "Cannot open dir '$data_dir/$rd': $!";
-
-	while ( defined( my $name = readdir RAID_DIR ) ) {
-	    $r_db_files->{"$rd/$name"} = $1 if ( $name =~ /(.+)\.\w+$/ );
-	}
-	closedir( RAID_DIR );
-    }
-}
-
-sub get_raid_dirs {
-    my ( $r_files ) = @_;
-
-    my %dirs = ();
-    foreach my $f ( @$r_files ) {
-	if ( $f =~ m:^($raid_dir_regex)/: ) {
-	    $dirs{$1} = 1;
-	}
-    }
-    return sort keys %dirs;
-}
-
 sub get_list_of_tables {
     my ( $db ) = @_;
 
@@ -887,9 +836,10 @@ log-pos-table from the values returned from "show master status" and
 log_file and log_pos columns, and establish the position in the binary
 logs that any slaves of this host should adopt if initialised from
 this dump.  The slave status values are stored in master_host,
-master_log_file, and master_log_pos, and these are useful if the host
-performing the dump is a slave and other sibling slaves are to be
-initialised from this dump.
+master_log_file, and master_log_pos, corresponding to the coordinates
+of the next to the last event the slave has executed. The slave or its
+siblings can connect to the master next time and request replication
+starting from the recorded values. 
 
 The name of the log-pos table should be supplied in database.table format.
 A sample log-pos table definition: