Here is an update to MySQL 5.0.41.

Tested on amd64.


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.130
diff -u -p -r1.130 Makefile
--- Makefile    2007/04/09 22:43:06     1.130
+++ Makefile    2007/05/13 16:45:06
@@ -9,7 +9,7 @@ COMMENT-main=   "multithreaded SQL databas
 COMMENT-server=        "multithreaded SQL database (server)"
 COMMENT-tests= "multithreaded SQL database (regression test suite)"
 
-VERSION=       5.0.37
+VERSION=       5.0.41
 DISTNAME=      mysql-${VERSION}
 PKGNAME-main=  mysql-client-${VERSION}
 PKGNAME-server=        mysql-server-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/mysql/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo    2007/04/09 22:43:06     1.29
+++ distinfo    2007/05/13 16:45:06
@@ -1,5 +1,5 @@
-MD5 (mysql-5.0.37.tar.gz) = Ju12+stYverkDIMQ4zfd4g==
-RMD160 (mysql-5.0.37.tar.gz) = Ey04hqgfzsm+UM3I2XyGiSj1Qk8=
-SHA1 (mysql-5.0.37.tar.gz) = fJV9QzcVbH+YsGF/1aY/OoOKm8Q=
-SHA256 (mysql-5.0.37.tar.gz) = mdQF3WiPmbg3nsE3MUOtJZ53vhTSJ3H4WwBY21Ayhcg=
-SIZE (mysql-5.0.37.tar.gz) = 23239518
+MD5 (mysql-5.0.41.tar.gz) = tFzWyJ4138HNvhofeCrvvw==
+RMD160 (mysql-5.0.41.tar.gz) = V/K1rGKIFKvSsZomPNLJDj4gWT0=
+SHA1 (mysql-5.0.41.tar.gz) = zCoRnJ4HFz/ObXj8h9lsYQLuqzY=
+SHA256 (mysql-5.0.41.tar.gz) = CMJyRsqbnPaVZ66mO4/XrvM3aeNp+azxY2Y0CX3Ed3U=
+SIZE (mysql-5.0.41.tar.gz) = 24083795
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-configure_in,v
retrieving revision 1.21
diff -u -p -r1.21 patch-configure_in
--- patches/patch-configure_in  2007/04/09 22:43:06     1.21
+++ patches/patch-configure_in  2007/05/13 16:45:06
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure_in,v 1.21 2007/04/09 22:43:06 ckuethe Exp $
---- configure.in.orig  Mon Mar  5 20:21:13 2007
-+++ configure.in       Sat Mar 31 19:00:36 2007
+--- configure.in.orig  Wed May  2 16:39:58 2007
++++ configure.in       Sun May 13 03:33:40 2007
 @@ -465,44 +465,7 @@ AC_SUBST(ICHECK)
  AC_PATH_PROG(PS, ps, ps)
  AC_MSG_CHECKING("how to check if pid exists")
@@ -47,7 +47,7 @@ $OpenBSD: patch-configure_in,v 1.21 2007
  AC_SUBST(FIND_PROC)
  AC_MSG_RESULT("$FIND_PROC")
  
-@@ -833,7 +796,8 @@ AC_ARG_WITH(libwrap,
+@@ -835,7 +798,8 @@ AC_ARG_WITH(libwrap,
      AC_CHECK_HEADER(tcpd.h,
        LIBS="-lwrap $LIBS"
        AC_MSG_CHECKING(for TCP wrappers library -lwrap)
@@ -57,7 +57,7 @@ $OpenBSD: patch-configure_in,v 1.21 2007
  int allow_severity = 0;
  int deny_severity  = 0;
  
-@@ -1601,7 +1565,7 @@ then
+@@ -1603,7 +1567,7 @@ then
    AC_CHECK_LIB(c_r,strtok_r)
    case "$with_osf32_threads---$target_os" in
      # Don't keep -lc_r in LIBS; -pthread handles it magically
@@ -66,7 +66,7 @@ $OpenBSD: patch-configure_in,v 1.21 2007
  
    esac
    AC_CHECK_FUNCS(strtok_r pthread_init)
-@@ -1649,29 +1613,6 @@ case $SYSTEM_TYPE in
+@@ -1651,29 +1615,6 @@ case $SYSTEM_TYPE in
  AC_SYS_RESTARTABLE_SYSCALLS
      ;;
  esac
Index: patches/patch-mysql-test_Makefile_in
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-mysql-test_Makefile_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-mysql-test_Makefile_in
--- patches/patch-mysql-test_Makefile_in        2007/01/25 07:41:48     1.13
+++ patches/patch-mysql-test_Makefile_in        2007/05/13 16:45:06
@@ -1,6 +1,6 @@
 $OpenBSD: patch-mysql-test_Makefile_in,v 1.13 2007/01/25 07:41:48 jakob Exp $
---- mysql-test/Makefile.in.orig        Tue Jan  9 07:52:50 2007
-+++ mysql-test/Makefile.in     Sun Jan 14 21:29:24 2007
+--- mysql-test/Makefile.in.orig        Wed May  2 16:42:28 2007
++++ mysql-test/Makefile.in     Sun May 13 03:33:40 2007
 @@ -373,7 +373,7 @@ zlib_dir = @zlib_dir@
  @[EMAIL PROTECTED] = ndb
  @[EMAIL PROTECTED] = \"\"
@@ -9,4 +9,4 @@ $OpenBSD: patch-mysql-test_Makefile_in,v
 +benchdir_root = $(datadir)
  testdir = $(benchdir_root)/mysql-test
  EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp 
$(PRESCRIPTS)
- EXTRA_DIST = $(EXTRA_SCRIPTS)
+ EXTRA_DIST = $(EXTRA_SCRIPTS) suite
Index: patches/patch-scripts_Makefile_in
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-scripts_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-scripts_Makefile_in
--- patches/patch-scripts_Makefile_in   2007/04/09 22:43:06     1.7
+++ patches/patch-scripts_Makefile_in   2007/05/13 16:45:06
@@ -1,7 +1,7 @@
 $OpenBSD: patch-scripts_Makefile_in,v 1.7 2007/04/09 22:43:06 ckuethe Exp $
---- scripts/Makefile.in.orig   Mon Mar  5 20:23:19 2007
-+++ scripts/Makefile.in        Sat Mar 31 19:01:17 2007
-@@ -655,6 +655,7 @@ mysqlbug: ${top_builddir}/config.status mysqlbug.sh
+--- scripts/Makefile.in.orig   Wed May  2 16:43:17 2007
++++ scripts/Makefile.in        Sun May 13 03:33:40 2007
+@@ -667,6 +667,7 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sq
          -e 's!@''datadir''@!$(datadir)!g' \
          -e 's!@''localstatedir''@!$(localstatedir)!g' \
          -e 's!@''libexecdir''@!$(libexecdir)!g' \
Index: patches/patch-scripts_mysql_install_db_sh
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-scripts_mysql_install_db_sh,v
retrieving revision 1.6
diff -u -p -r1.6 patch-scripts_mysql_install_db_sh
--- patches/patch-scripts_mysql_install_db_sh   2007/04/09 22:43:06     1.6
+++ patches/patch-scripts_mysql_install_db_sh   2007/05/13 16:45:06
@@ -1,7 +1,7 @@
 $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.6 2007/04/09 22:43:06 ckuethe 
Exp $
---- scripts/mysql_install_db.sh.orig   Mon Mar  5 20:21:13 2007
-+++ scripts/mysql_install_db.sh        Sat Mar 31 19:01:27 2007
-@@ -22,7 +22,8 @@
+--- scripts/mysql_install_db.sh.orig   Wed May  2 16:39:59 2007
++++ scripts/mysql_install_db.sh        Sun May 13 03:41:46 2007
+@@ -21,7 +21,8 @@
  in_rpm=0
  windows=0
  defaults=""
@@ -11,58 +11,64 @@ $OpenBSD: patch-scripts_mysql_install_db
  
  case "$1" in
      --no-defaults|--defaults-file=*|--defaults-extra-file=*)
-@@ -52,6 +53,7 @@ parse_arguments() {
+@@ -59,6 +60,7 @@ parse_arguments() {
          # as 'user' (crucial e.g. if log-bin=/some_other_path/
          # where a chown of datadir won't help)
         user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
 +      --group=*) group=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
        --skip-name-resolve) ip_only=1 ;;
-       --verbose) verbose=1 ;;
+       --verbose) verbose=1 ;; # Obsolete
        --rpm) in_rpm=1 ;;
-@@ -209,12 +211,10 @@ fi
+@@ -248,20 +250,18 @@ fi
  
  # Create database directories mysql & test
+ if test ! -d $ldata; then
+-  mkdir $ldata;
++  mkdir -p $ldata;
+   chmod 700 $ldata ;
+ fi
+ if test ! -d $ldata/mysql; then
+-  mkdir $ldata/mysql;
++  mkdir -p $ldata/mysql;
+   chmod 700 $ldata/mysql ;
+ fi
+ if test ! -d $ldata/test; then
+-  mkdir $ldata/test;
++  mkdir -p $ldata/test;
+   chmod 700 $ldata/test ;
+ fi
+-if test -w / -a ! -z "$user"; then
+-  chown $user $ldata $ldata/mysql $ldata/test;
+-fi
++chown -f $user:$group $ldata $ldata/mysql $ldata/test
  
--  if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
--  if test ! -d $ldata/mysql; then mkdir $ldata/mysql;  chmod 700 $ldata/mysql 
; fi
--  if test ! -d $ldata/test; then mkdir $ldata/test;  chmod 700 $ldata/test ; 
fi
--  if test -w / -a ! -z "$user"; then
--    chown $user $ldata $ldata/mysql $ldata/test;
--  fi
-+  if test ! -d $ldata; then mkdir -p $ldata; chmod 700 $ldata ; fi
-+  if test ! -d $ldata/mysql; then mkdir -p $ldata/mysql;  chmod 700 
$ldata/mysql ; fi
-+  if test ! -d $ldata/test; then mkdir -p $ldata/test;  chmod 700 $ldata/test 
; fi
-+  chown -f $user:$group $ldata $ldata/mysql $ldata/test;
- 
- if test ! -f $mdata/db.frm
- then
-@@ -259,13 +259,6 @@ then
-       echo ""
+ if test -n "$user"; then
+   args="$args --user=$user"
+@@ -296,11 +296,6 @@ then
      fi
    fi
--  if test "$in_rpm" = 0 -a "$windows" = 0
--  then
--    echo ""
--    echo "To start mysqld at boot time you have to copy 
support-files/mysql.server"
--    echo "to the right place for your system"
--    echo
--  fi
+ 
+-  s_echo ""
+-  s_echo "To start mysqld at boot time you have to copy"
+-  s_echo "support-files/mysql.server to the right place for your system"
+-  s_echo
+-
    if test "$windows" -eq 0
    then
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-@@ -283,15 +276,6 @@ then
-     echo "able to use the new GRANT command!"
-   fi
-   echo
--  if test "$in_rpm" = "0"
--  then
--    echo "You can start the MySQL daemon with:"
--    echo "cd @prefix@ ; $bindir/mysqld_safe &"
--    echo
--    echo "You can test the MySQL daemon with the benchmarks in the 
'sql-bench' directory:"
--    echo "cd sql-bench ; perl run-all-tests"
--    echo
--  fi
-   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
-   echo
-   echo "The latest information about MySQL is available on the web at"
+     # A root password should of course also be set on Windows!
+@@ -315,15 +310,6 @@ then
+     echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
+     echo "See the manual for more instructions."
+ 
+-    if test "$in_rpm" = "0"
+-    then
+-      echo "You can start the MySQL daemon with:"
+-      echo "cd @prefix@ ; $bindir/mysqld_safe &"
+-      echo
+-      echo "You can test the MySQL daemon with mysql-test-run.pl"
+-      echo "cd mysql-test ; perl mysql-test-run.pl"
+-      echo
+-    fi
+     echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+     echo
+     echo "The latest information about MySQL is available on the web at"
Index: patches/patch-sql_mysqld_cc
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-sql_mysqld_cc,v
retrieving revision 1.8
diff -u -p -r1.8 patch-sql_mysqld_cc
--- patches/patch-sql_mysqld_cc 2007/04/09 22:43:06     1.8
+++ patches/patch-sql_mysqld_cc 2007/05/13 16:45:06
@@ -1,7 +1,7 @@
 $OpenBSD: patch-sql_mysqld_cc,v 1.8 2007/04/09 22:43:06 ckuethe Exp $
---- sql/mysqld.cc.orig Mon Mar  5 20:21:11 2007
-+++ sql/mysqld.cc      Sat Mar 31 19:02:57 2007
-@@ -3431,7 +3431,7 @@ int main(int argc, char **argv)
+--- sql/mysqld.cc.orig Wed May  2 16:39:46 2007
++++ sql/mysqld.cc      Sun May 13 03:33:40 2007
+@@ -3502,7 +3502,7 @@ int main(int argc, char **argv)
    init_ssl();
  
  #ifdef HAVE_LIBWRAP
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main      2007/01/25 07:41:48     1.3
+++ pkg/PLIST-main      2007/05/13 16:45:06
@@ -3,7 +3,6 @@
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
-bin/mysql_create_system_tables
 bin/mysql_tzinfo_to_sql
 bin/mysqladmin
 bin/mysqlbinlog
@@ -16,6 +15,7 @@ bin/mysqltest
 bin/mysqltestmanager-pwgen
 bin/mysqltestmanagerc
 include/mysql/
+include/mysql/decimal.h
 include/mysql/errmsg.h
 include/mysql/keycache.h
 include/mysql/m_ctype.h
@@ -30,7 +30,6 @@ include/mysql/my_list.h
 include/mysql/my_net.h
 include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
 include/mysql/my_sys.h
 include/mysql/my_xml.h
 include/mysql/mysql.h
@@ -62,4 +61,7 @@ lib/mysql/libmysqlclient_r.la
 @man man/man1/mysqldump.1
 @man man/man1/mysqlimport.1
 @man man/man1/mysqlman.1
[EMAIL PROTECTED] man/man1/mysqlmanager-pwgen.1
[EMAIL PROTECTED] man/man1/mysqlmanagerc.1
 @man man/man1/mysqlshow.1
[EMAIL PROTECTED] man/man1/mysqltest.1
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-server,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST-server
--- pkg/PLIST-server    2007/04/09 22:43:06     1.26
+++ pkg/PLIST-server    2007/05/13 16:45:06
@@ -40,7 +40,10 @@ lib/mysql/libmysys.a
 lib/mysql/libvio.a
 libexec/mysqld
 libexec/mysqlmanager
[EMAIL PROTECTED] man/man1/comp_err.1
[EMAIL PROTECTED] man/man1/innochecksum.1
 @man man/man1/make_win_bin_dist.1
[EMAIL PROTECTED] man/man1/make_win_src_distribution.1
 @man man/man1/msql2mysql.1
 @man man/man1/my_print_defaults.1
 @man man/man1/myisam_ftdump.1
@@ -48,36 +51,26 @@ libexec/mysqlmanager
 @man man/man1/myisamlog.1
 @man man/man1/myisampack.1
 @man man/man1/mysql.server.1
[EMAIL PROTECTED] man/man1/mysql_convert_table_format.1
 @man man/man1/mysql_explain_log.1
[EMAIL PROTECTED] man/man1/mysql_find_rows.1
[EMAIL PROTECTED] man/man1/mysql_fix_extensions.1
 @man man/man1/mysql_fix_privilege_tables.1
 @man man/man1/mysql_install_db.1
[EMAIL PROTECTED] man/man1/mysql_secure_installation.1
[EMAIL PROTECTED] man/man1/mysql_setpermission.1
[EMAIL PROTECTED] man/man1/mysql_tableinfo.1
 @man man/man1/mysql_upgrade.1
[EMAIL PROTECTED] man/man1/mysql_waitpid.1
 @man man/man1/mysql_zap.1
 @man man/man1/mysqlaccess.1
 @man man/man1/mysqld_multi.1
 @man man/man1/mysqld_safe.1
 @man man/man1/mysqlhotcopy.1
[EMAIL PROTECTED] man/man1/ndb_config.1
[EMAIL PROTECTED] man/man1/ndb_cpcd.1
[EMAIL PROTECTED] man/man1/ndb_delete_all.1
[EMAIL PROTECTED] man/man1/ndb_desc.1
[EMAIL PROTECTED] man/man1/ndb_drop_index.1
[EMAIL PROTECTED] man/man1/ndb_drop_table.1
[EMAIL PROTECTED] man/man1/ndb_error_reporter.1
[EMAIL PROTECTED] man/man1/ndb_mgm.1
[EMAIL PROTECTED] man/man1/ndb_mgmd.1
[EMAIL PROTECTED] man/man1/ndb_print_backup_file.1
[EMAIL PROTECTED] man/man1/ndb_print_schema_file.1
[EMAIL PROTECTED] man/man1/ndb_print_sys_file.1
[EMAIL PROTECTED] man/man1/ndb_restore.1
[EMAIL PROTECTED] man/man1/ndb_select_all.1
[EMAIL PROTECTED] man/man1/ndb_select_count.1
[EMAIL PROTECTED] man/man1/ndb_show_tables.1
[EMAIL PROTECTED] man/man1/ndb_size.pl.1
[EMAIL PROTECTED] man/man1/ndb_waiter.1
[EMAIL PROTECTED] man/man1/ndbd.1
 @man man/man1/perror.1
 @man man/man1/replace.1
[EMAIL PROTECTED] man/man1/resolve_stack_dump.1
[EMAIL PROTECTED] man/man1/resolveip.1
 @man man/man1/safe_mysqld.1
 @man man/man8/mysqld.8
 @man man/man8/mysqlmanager.8
@@ -147,6 +140,9 @@ share/mysql/my-small.cnf
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/mysql_fix_privilege_tables.sql
+share/mysql/mysql_system_tables.sql
+share/mysql/mysql_system_tables_data.sql
+share/mysql/mysql_test_data_timezone.sql
 share/mysql/ndb-config-2-node.ini
 share/mysql/norwegian/
 share/mysql/norwegian-ny/
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-tests,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST-tests
--- pkg/PLIST-tests     2007/04/09 22:43:06     1.23
+++ pkg/PLIST-tests     2007/05/13 16:45:07
@@ -1,10 +1,14 @@
 @comment $OpenBSD: PLIST-tests,v 1.23 2007/04/09 22:43:06 ckuethe Exp $
[EMAIL PROTECTED] man/man1/mysql-stress-test.pl.1
[EMAIL PROTECTED] man/man1/mysql-test-run.pl.1
[EMAIL PROTECTED] man/man1/mysql_client_test.1
 share/mysql-test/
 share/mysql-test/README
 share/mysql-test/cacert.pem
 share/mysql-test/client-cert.pem
 share/mysql-test/client-key.pem
 share/mysql-test/include/
+share/mysql-test/include/add_anonymous_users.inc
 share/mysql-test/include/analyze_failure_sync_with_master.test
 share/mysql-test/include/big_test.inc
 share/mysql-test/include/check-testcase.test
@@ -14,6 +18,7 @@ share/mysql-test/include/ctype_common.in
 share/mysql-test/include/ctype_filesort.inc
 share/mysql-test/include/ctype_innodb_like.inc
 share/mysql-test/include/ctype_like_escape.inc
+share/mysql-test/include/delete_anonymous_users.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/federated.inc
 share/mysql-test/include/federated_cleanup.inc
@@ -42,10 +47,10 @@ share/mysql-test/include/have_latin2_ch.
 share/mysql-test/include/have_lowercase0.inc
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
-share/mysql-test/include/have_openssl.inc
 share/mysql-test/include/have_outfile.inc
 share/mysql-test/include/have_query_cache.inc
 share/mysql-test/include/have_sjis.inc
+share/mysql-test/include/have_ssl.inc
 share/mysql-test/include/have_tis620.inc
 share/mysql-test/include/have_ucs2.inc
 share/mysql-test/include/have_udf.inc
@@ -56,6 +61,8 @@ share/mysql-test/include/is_debug_build.
 share/mysql-test/include/loaddata_autocom.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/mysqltest-x.inc
+share/mysql-test/include/ndb_backup.inc
+share/mysql-test/include/ndb_backup_print.inc
 share/mysql-test/include/ndb_default_cluster.inc
 share/mysql-test/include/not_as_root.inc
 share/mysql-test/include/not_embedded.inc
@@ -83,7 +90,6 @@ share/mysql-test/include/wait_slave_stat
 share/mysql-test/include/windows.inc
 share/mysql-test/install_test_db
 share/mysql-test/lib/
-share/mysql-test/lib/init_db.sql
 share/mysql-test/lib/mtr_cases.pl
 share/mysql-test/lib/mtr_diff.pl
 share/mysql-test/lib/mtr_gcov.pl
@@ -127,6 +133,7 @@ share/mysql-test/r/binary.result
 share/mysql-test/r/binlog.result
 share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
+share/mysql-test/r/bootstrap.result
 share/mysql-test/r/bulk_replace.result
 share/mysql-test/r/case.result
 share/mysql-test/r/case_sensitive_file_system.require
@@ -272,12 +279,12 @@ share/mysql-test/r/have_moscow_leap_time
 share/mysql-test/r/have_mysql_upgrade.result
 share/mysql-test/r/have_ndb.require
 share/mysql-test/r/have_ndb_status_ok.require
-share/mysql-test/r/have_openssl.require
 share/mysql-test/r/have_outfile.require
 share/mysql-test/r/have_perror.require
 share/mysql-test/r/have_query_cache.require
 share/mysql-test/r/have_raid.require
 share/mysql-test/r/have_sjis.require
+share/mysql-test/r/have_ssl.require
 share/mysql-test/r/have_symlink.require
 share/mysql-test/r/have_tis620.require
 share/mysql-test/r/have_ucs2.require
@@ -311,6 +318,7 @@ share/mysql-test/r/innodb-big.result
 share/mysql-test/r/innodb-deadlock.result
 share/mysql-test/r/innodb-lock.result
 share/mysql-test/r/innodb-replace.result
+share/mysql-test/r/innodb-ucs2.result
 share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_gis.result
@@ -364,6 +372,7 @@ share/mysql-test/r/mysql_client_test.res
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysql_upgrade.result
 share/mysql-test/r/mysqladmin.result
+share/mysql-test/r/mysqlbinlog-cp932.result
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
 share/mysql-test/r/mysqlcheck.result
@@ -404,6 +413,8 @@ share/mysql-test/r/ndb_read_multi_range.
 share/mysql-test/r/ndb_rename.result
 share/mysql-test/r/ndb_replace.result
 share/mysql-test/r/ndb_restore.result
+share/mysql-test/r/ndb_restore_print.result
+share/mysql-test/r/ndb_single_user.result
 share/mysql-test/r/ndb_subquery.result
 share/mysql-test/r/ndb_transaction.result
 share/mysql-test/r/ndb_trigger.result
@@ -496,10 +507,13 @@ share/mysql-test/r/rpl_ignore_revoke.res
 share/mysql-test/r/rpl_ignore_table.result
 share/mysql-test/r/rpl_init_slave.result
 share/mysql-test/r/rpl_innodb.result
+share/mysql-test/r/rpl_insert_delayed.result
 share/mysql-test/r/rpl_insert_id.result
 share/mysql-test/r/rpl_insert_ignore.result
 share/mysql-test/r/rpl_insert_select.result
+share/mysql-test/r/rpl_known_bugs_detection.result
 share/mysql-test/r/rpl_loaddata.result
+share/mysql-test/r/rpl_loaddata_charset.result
 share/mysql-test/r/rpl_loaddata_rule_m.result
 share/mysql-test/r/rpl_loaddata_rule_s.result
 share/mysql-test/r/rpl_loaddatalocal.result
@@ -539,6 +553,7 @@ share/mysql-test/r/rpl_slave_status.resu
 share/mysql-test/r/rpl_sp.result
 share/mysql-test/r/rpl_sp_effects.result
 share/mysql-test/r/rpl_sporadic_master.result
+share/mysql-test/r/rpl_ssl.result
 share/mysql-test/r/rpl_start_stop_slave.result
 share/mysql-test/r/rpl_temporary.result
 share/mysql-test/r/rpl_timezone.result
@@ -567,6 +582,7 @@ share/mysql-test/r/sp-error.result
 share/mysql-test/r/sp-prelocking.result
 share/mysql-test/r/sp-security.result
 share/mysql-test/r/sp-threads.result
+share/mysql-test/r/sp-ucs2.result
 share/mysql-test/r/sp-vars.result
 share/mysql-test/r/sp.result
 share/mysql-test/r/sp_notembedded.result
@@ -576,7 +592,6 @@ share/mysql-test/r/sql_mode.result
 share/mysql-test/r/ssl.result
 share/mysql-test/r/ssl_compress.result
 share/mysql-test/r/ssl_connect.result
-share/mysql-test/r/ssl_des.result
 share/mysql-test/r/status.result
 share/mysql-test/r/strict.result
 share/mysql-test/r/strict_autoinc_1myisam.result
@@ -666,6 +681,7 @@ share/mysql-test/std_data/loaddata2.dat
 share/mysql-test/std_data/loaddata3.dat
 share/mysql-test/std_data/loaddata4.dat
 share/mysql-test/std_data/loaddata5.dat
+share/mysql-test/std_data/loaddata6.dat
 share/mysql-test/std_data/loaddata_dq.dat
 share/mysql-test/std_data/loaddata_pair.dat
 share/mysql-test/std_data/master-bin.000001
@@ -683,6 +699,331 @@ share/mysql-test/std_data/untrusted-cace
 share/mysql-test/std_data/vchar.frm
 share/mysql-test/std_data/warnings_loaddata.dat
 share/mysql-test/std_data/words.dat
+share/mysql-test/suite/
+share/mysql-test/suite/funcs_1/
+share/mysql-test/suite/funcs_1/README.txt
+share/mysql-test/suite/funcs_1/bitdata/
+share/mysql-test/suite/funcs_1/bitdata/bitdata_master.test
+share/mysql-test/suite/funcs_1/cursors/
+share/mysql-test/suite/funcs_1/cursors/cursors_master.test
+share/mysql-test/suite/funcs_1/data/
+share/mysql-test/suite/funcs_1/data/innodb_tb1.txt
+share/mysql-test/suite/funcs_1/data/innodb_tb2.txt
+share/mysql-test/suite/funcs_1/data/innodb_tb3.txt
+share/mysql-test/suite/funcs_1/data/innodb_tb4.txt
+share/mysql-test/suite/funcs_1/data/memory_tb1.txt
+share/mysql-test/suite/funcs_1/data/memory_tb2.txt
+share/mysql-test/suite/funcs_1/data/memory_tb3.txt
+share/mysql-test/suite/funcs_1/data/memory_tb4.txt
+share/mysql-test/suite/funcs_1/data/myisam_tb1.txt
+share/mysql-test/suite/funcs_1/data/myisam_tb2.txt
+share/mysql-test/suite/funcs_1/data/myisam_tb3.txt
+share/mysql-test/suite/funcs_1/data/myisam_tb4.txt
+share/mysql-test/suite/funcs_1/data/t3.txt
+share/mysql-test/suite/funcs_1/data/t4.txt
+share/mysql-test/suite/funcs_1/data/t7.txt
+share/mysql-test/suite/funcs_1/data/t9.txt
+share/mysql-test/suite/funcs_1/datadict/
+share/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_load.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
+share/mysql-test/suite/funcs_1/include/
+share/mysql-test/suite/funcs_1/include/create_database.inc
+share/mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
+share/mysql-test/suite/funcs_1/include/create_user_no_super.inc
+share/mysql-test/suite/funcs_1/include/innodb_tb1.inc
+share/mysql-test/suite/funcs_1/include/innodb_tb2.inc
+share/mysql-test/suite/funcs_1/include/innodb_tb3.inc
+share/mysql-test/suite/funcs_1/include/innodb_tb4.inc
+share/mysql-test/suite/funcs_1/include/memory_tb1.inc
+share/mysql-test/suite/funcs_1/include/memory_tb2.inc
+share/mysql-test/suite/funcs_1/include/memory_tb3.inc
+share/mysql-test/suite/funcs_1/include/memory_tb4.inc
+share/mysql-test/suite/funcs_1/include/myisam_tb1.inc
+share/mysql-test/suite/funcs_1/include/myisam_tb2.inc
+share/mysql-test/suite/funcs_1/include/myisam_tb3.inc
+share/mysql-test/suite/funcs_1/include/myisam_tb4.inc
+share/mysql-test/suite/funcs_1/include/show_connection.inc
+share/mysql-test/suite/funcs_1/include/sp_tb.inc
+share/mysql-test/suite/funcs_1/lib/
+share/mysql-test/suite/funcs_1/lib/DataGen_local.pl
+share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
+share/mysql-test/suite/funcs_1/r/
+share/mysql-test/suite/funcs_1/r/a_version_check.result
+share/mysql-test/suite/funcs_1/r/innodb__datadict.result
+share/mysql-test/suite/funcs_1/r/innodb__load.result
+share/mysql-test/suite/funcs_1/r/innodb_bitdata.result
+share/mysql-test/suite/funcs_1/r/innodb_cursors.result
+share/mysql-test/suite/funcs_1/r/innodb_func_view.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_03.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_09.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
+share/mysql-test/suite/funcs_1/r/innodb_triggers.result
+share/mysql-test/suite/funcs_1/r/innodb_views.result
+share/mysql-test/suite/funcs_1/r/innodb_views.warnings
+share/mysql-test/suite/funcs_1/r/memory__datadict.result
+share/mysql-test/suite/funcs_1/r/memory__load.result
+share/mysql-test/suite/funcs_1/r/memory_bitdata.result
+share/mysql-test/suite/funcs_1/r/memory_cursors.result
+share/mysql-test/suite/funcs_1/r/memory_func_view.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_03.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_07.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_08.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
+share/mysql-test/suite/funcs_1/r/memory_trig_0102.result
+share/mysql-test/suite/funcs_1/r/memory_trig_03.result
+share/mysql-test/suite/funcs_1/r/memory_trig_0407.result
+share/mysql-test/suite/funcs_1/r/memory_trig_08.result
+share/mysql-test/suite/funcs_1/r/memory_trig_09.result
+share/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
+share/mysql-test/suite/funcs_1/r/memory_triggers.result
+share/mysql-test/suite/funcs_1/r/memory_views.result
+share/mysql-test/suite/funcs_1/r/memory_views.warnings
+share/mysql-test/suite/funcs_1/r/myisam__datadict.result
+share/mysql-test/suite/funcs_1/r/myisam__load.result
+share/mysql-test/suite/funcs_1/r/myisam_bitdata.result
+share/mysql-test/suite/funcs_1/r/myisam_cursors.result
+share/mysql-test/suite/funcs_1/r/myisam_func_view.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_03.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_09.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
+share/mysql-test/suite/funcs_1/r/myisam_triggers.result
+share/mysql-test/suite/funcs_1/r/myisam_views.result
+share/mysql-test/suite/funcs_1/r/myisam_views.warnings
+share/mysql-test/suite/funcs_1/storedproc/
+share/mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
+share/mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
+share/mysql-test/suite/funcs_1/t/
+share/mysql-test/suite/funcs_1/t/a_version_check.test
+share/mysql-test/suite/funcs_1/t/disabled.def
+share/mysql-test/suite/funcs_1/t/innodb__datadict.test
+share/mysql-test/suite/funcs_1/t/innodb__load.test
+share/mysql-test/suite/funcs_1/t/innodb_bitdata.test
+share/mysql-test/suite/funcs_1/t/innodb_cursors.test
+share/mysql-test/suite/funcs_1/t/innodb_func_view.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_0102.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_03.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_0407.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_08.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_09.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
+share/mysql-test/suite/funcs_1/t/innodb_views.test
+share/mysql-test/suite/funcs_1/t/memory__datadict.test
+share/mysql-test/suite/funcs_1/t/memory__load.test
+share/mysql-test/suite/funcs_1/t/memory_bitdata.test
+share/mysql-test/suite/funcs_1/t/memory_cursors.test
+share/mysql-test/suite/funcs_1/t/memory_func_view.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_02.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_03.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_06.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_07.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_08.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_10.test
+share/mysql-test/suite/funcs_1/t/memory_trig_0102.test
+share/mysql-test/suite/funcs_1/t/memory_trig_03.test
+share/mysql-test/suite/funcs_1/t/memory_trig_0407.test
+share/mysql-test/suite/funcs_1/t/memory_trig_08.test
+share/mysql-test/suite/funcs_1/t/memory_trig_09.test
+share/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
+share/mysql-test/suite/funcs_1/t/memory_views.test
+share/mysql-test/suite/funcs_1/t/myisam__datadict.test
+share/mysql-test/suite/funcs_1/t/myisam__load.test
+share/mysql-test/suite/funcs_1/t/myisam_bitdata.test
+share/mysql-test/suite/funcs_1/t/myisam_cursors.test
+share/mysql-test/suite/funcs_1/t/myisam_func_view.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_0102.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_03.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_0407.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_08.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_09.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
+share/mysql-test/suite/funcs_1/t/myisam_views.test
+share/mysql-test/suite/funcs_1/triggers/
+share/mysql-test/suite/funcs_1/triggers/trig_frkey.inc
+share/mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_03.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_08.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_09.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_master.test
+share/mysql-test/suite/funcs_1/views/
+share/mysql-test/suite/funcs_1/views/func_view.inc
+share/mysql-test/suite/funcs_1/views/fv1.inc
+share/mysql-test/suite/funcs_1/views/fv2.inc
+share/mysql-test/suite/funcs_1/views/fv_cast.inc
+share/mysql-test/suite/funcs_1/views/fv_if1.inc
+share/mysql-test/suite/funcs_1/views/fv_if2.inc
+share/mysql-test/suite/funcs_1/views/fv_ifnull.inc
+share/mysql-test/suite/funcs_1/views/views_master.inc
+share/mysql-test/suite/funcs_2/
+share/mysql-test/suite/funcs_2/charset/
+share/mysql-test/suite/funcs_2/charset/charset_master.test
+share/mysql-test/suite/funcs_2/data/
+share/mysql-test/suite/funcs_2/data/charset_utf8.txt
+share/mysql-test/suite/funcs_2/include/
+share/mysql-test/suite/funcs_2/include/check_charset.inc
+share/mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
+share/mysql-test/suite/funcs_2/include/check_charset_utf8.inc
+share/mysql-test/suite/funcs_2/lib/
+share/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
+share/mysql-test/suite/funcs_2/r/
+share/mysql-test/suite/funcs_2/r/innodb_charset.result
+share/mysql-test/suite/funcs_2/r/memory_charset.result
+share/mysql-test/suite/funcs_2/r/myisam_charset.result
+share/mysql-test/suite/funcs_2/r/ndb_charset.result
+share/mysql-test/suite/funcs_2/readme.txt
+share/mysql-test/suite/funcs_2/t/
+share/mysql-test/suite/funcs_2/t/innodb_charset.test
+share/mysql-test/suite/funcs_2/t/memory_charset.test
+share/mysql-test/suite/funcs_2/t/myisam_charset.test
+share/mysql-test/suite/funcs_2/t/ndb_charset.test
+share/mysql-test/suite/row_lock/
+share/mysql-test/suite/row_lock/include/
+share/mysql-test/suite/row_lock/include/row_lock.inc
+share/mysql-test/suite/row_lock/include/row_lock_big_tab.inc
+share/mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
+share/mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
+share/mysql-test/suite/row_lock/include/row_lock_trig.inc
+share/mysql-test/suite/row_lock/include/row_lock_view.inc
+share/mysql-test/suite/row_lock/include/row_lock_view_mix.inc
+share/mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
+share/mysql-test/suite/row_lock/include/row_lock_view_trig.inc
+share/mysql-test/suite/row_lock/r/
+share/mysql-test/suite/row_lock/r/innodb_row_lock_1.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_2.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_3.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_4.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_5.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
+share/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_1.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_2.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_3.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_4.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_5.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
+share/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
+share/mysql-test/suite/row_lock/readme.txt
+share/mysql-test/suite/row_lock/summary_of_sel_test.txt
+share/mysql-test/suite/row_lock/t/
+share/mysql-test/suite/row_lock/t/innodb_row_lock_1.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_2.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_3.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_4.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_5.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
+share/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_1.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_2.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_3.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_4.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_5.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
+share/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test
 share/mysql-test/t/
 share/mysql-test/t/alias.test
 share/mysql-test/t/alter_table-big.test
@@ -712,6 +1053,7 @@ share/mysql-test/t/binlog-master.opt
 share/mysql-test/t/binlog.test
 share/mysql-test/t/blackhole.test
 share/mysql-test/t/bool.test
+share/mysql-test/t/bootstrap.test
 share/mysql-test/t/bulk_replace.test
 share/mysql-test/t/case.test
 share/mysql-test/t/cast.test
@@ -872,6 +1214,7 @@ share/mysql-test/t/innodb-deadlock.test
 share/mysql-test/t/innodb-lock.test
 share/mysql-test/t/innodb-master.opt
 share/mysql-test/t/innodb-replace.test
+share/mysql-test/t/innodb-ucs2.test
 share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
@@ -942,6 +1285,8 @@ share/mysql-test/t/mysql_delimiter_sourc
 share/mysql-test/t/mysql_protocols.test
 share/mysql-test/t/mysql_upgrade.test
 share/mysql-test/t/mysqladmin.test
+share/mysql-test/t/mysqlbinlog-cp932-master.opt
+share/mysql-test/t/mysqlbinlog-cp932.test
 share/mysql-test/t/mysqlbinlog-master.opt
 share/mysql-test/t/mysqlbinlog.test
 share/mysql-test/t/mysqlbinlog2.test
@@ -982,6 +1327,8 @@ share/mysql-test/t/ndb_read_multi_range.
 share/mysql-test/t/ndb_rename.test
 share/mysql-test/t/ndb_replace.test
 share/mysql-test/t/ndb_restore.test
+share/mysql-test/t/ndb_restore_print.test
+share/mysql-test/t/ndb_single_user.test
 share/mysql-test/t/ndb_subquery.test
 share/mysql-test/t/ndb_transaction.test
 share/mysql-test/t/ndb_trigger.test
@@ -1102,12 +1449,16 @@ share/mysql-test/t/rpl_ignore_table.test
 share/mysql-test/t/rpl_init_slave-slave.opt
 share/mysql-test/t/rpl_init_slave.test
 share/mysql-test/t/rpl_innodb.test
+share/mysql-test/t/rpl_insert_delayed.test
 share/mysql-test/t/rpl_insert_id-slave.opt
 share/mysql-test/t/rpl_insert_id.test
 share/mysql-test/t/rpl_insert_ignore-slave.opt
 share/mysql-test/t/rpl_insert_ignore.test
 share/mysql-test/t/rpl_insert_select.test
+share/mysql-test/t/rpl_known_bugs_detection-master.opt
+share/mysql-test/t/rpl_known_bugs_detection.test
 share/mysql-test/t/rpl_loaddata.test
+share/mysql-test/t/rpl_loaddata_charset.test
 share/mysql-test/t/rpl_loaddata_rule_m-master.opt
 share/mysql-test/t/rpl_loaddata_rule_m.test
 share/mysql-test/t/rpl_loaddata_rule_s-slave.opt
@@ -1173,6 +1524,7 @@ share/mysql-test/t/rpl_sp_effects-slave.
 share/mysql-test/t/rpl_sp_effects.test
 share/mysql-test/t/rpl_sporadic_master-master.opt
 share/mysql-test/t/rpl_sporadic_master.test
+share/mysql-test/t/rpl_ssl.test
 share/mysql-test/t/rpl_start_stop_slave.test
 share/mysql-test/t/rpl_temporary.test
 share/mysql-test/t/rpl_timezone-master.opt
@@ -1204,6 +1556,7 @@ share/mysql-test/t/sp-error.test
 share/mysql-test/t/sp-prelocking.test
 share/mysql-test/t/sp-security.test
 share/mysql-test/t/sp-threads.test
+share/mysql-test/t/sp-ucs2.test
 share/mysql-test/t/sp-vars.test
 share/mysql-test/t/sp.test
 share/mysql-test/t/sp_notembedded.test
@@ -1213,8 +1566,6 @@ share/mysql-test/t/sql_mode.test
 share/mysql-test/t/ssl.test
 share/mysql-test/t/ssl_compress.test
 share/mysql-test/t/ssl_connect.test
-share/mysql-test/t/ssl_des-master.opt
-share/mysql-test/t/ssl_des.test
 share/mysql-test/t/status.test
 share/mysql-test/t/strict.test
 share/mysql-test/t/strict_autoinc_1myisam.test

Reply via email to