upgrade to MySQL 5.0.18

databases/mysql/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.113 2005/12/26 21:32:01 sturm Exp $
+# $OpenBSD: Makefile,v 1.114 2006/01/06 00:13:26 brad Exp $
 # Uses pthreads
 
 .if ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "m88k"
@@ -9,15 +9,15 @@ COMMENT=	"multithreaded SQL database (client)"
 COMMENT-server=	"multithreaded SQL database (server)"
 COMMENT-tests=	"multithreaded SQL database (regression test suite)"
 
-VERSION=	4.1.15
+VERSION=	5.0.18
 DISTNAME=	mysql-${VERSION}
-FULLPKGNAME=	mysql-client-${VERSION}p0
+FULLPKGNAME=	mysql-client-${VERSION}
 PKGNAME-server=	mysql-server-${VERSION}
 FULLPKGNAME-tests= mysql-tests-${VERSION}
 CATEGORIES=	databases
-V=		MySQL-4.1
-SHARED_LIBS=	mysqlclient	14.0 \
-		mysqlclient_r	14.0
+V=		MySQL-5.0
+SHARED_LIBS=	mysqlclient	15.0 \
+		mysqlclient_r	15.0
 
 MASTER_SITES=	http://mysql.mirrors.pair.com/Downloads/$V/
 
@@ -50,6 +50,7 @@ AUTOCONF_VERSION= 2.59
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-thread-safe-client \
 		 --localstatedir="${DB_DIR}" \
+		 --with-big-tables \
 		 --with-comment='OpenBSD port: ${FULLPKGNAME-server}' \
 		 --with-libwrap \
 		 --with-low-memory \
@@ -80,7 +81,7 @@ MULTI_PACKAGES=	-server -tests
 SUBPACKAGE?=
 
 .if ${SUBPACKAGE} == "-server"
-RUN_DEPENDS=	:mysql-client-4.1.*:databases/mysql \
+RUN_DEPENDS=	:mysql-client-5.0.*:databases/mysql \
 		:p5-DBD-mysql-*:databases/p5-DBD-mysql
 WANTLIB+=	wrap		
 .elif empty(SUBPACKAGE)

databases/mysql/distinfo

@@ -1,4 +1,4 @@
-MD5 (mysql-4.1.15.tar.gz) = 65a0841e592641b8816f9212aaa40176
-RMD160 (mysql-4.1.15.tar.gz) = 07e0c3d5d206f9545cff145cb3ec8db4e395bff0
-SHA1 (mysql-4.1.15.tar.gz) = 04e275df6c538117eac9a5ba2ab56e5f01f69286
-SIZE (mysql-4.1.15.tar.gz) = 17257765
+MD5 (mysql-5.0.18.tar.gz) = f18153b0239aaa03fc5a751f2d82cb71
+RMD160 (mysql-5.0.18.tar.gz) = 1987df6d9446637c8e353f61e269e9a57d995803
+SHA1 (mysql-5.0.18.tar.gz) = e102a5086455c0f80a830e5dfc65acccc5e19a60
+SIZE (mysql-5.0.18.tar.gz) = 19169082

databases/mysql/patches/patch-configure_in

@@ -1,53 +1,53 @@
-$OpenBSD: patch-configure_in,v 1.13 2005/12/12 04:55:44 brad Exp $
---- configure.in.orig	Sun Oct  9 18:46:32 2005
-+++ configure.in	Sun Dec 11 22:02:08 2005
-@@ -503,44 +503,7 @@ AC_SUBST(MAKEINDEX)
+$OpenBSD: patch-configure_in,v 1.14 2006/01/06 00:13:26 brad Exp $
+--- configure.in.orig	Wed Dec 14 18:33:31 2005
++++ configure.in	Sun Dec 18 17:36:11 2005
+@@ -433,44 +433,7 @@ AC_SUBST(MAKEINDEX)
  AC_PATH_PROG(PS, ps, ps)
  AC_MSG_CHECKING("how to check if pid exists")
  PS=$ac_cv_path_PS
 -# Linux style
 -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
 -then
--  FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
+-  FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
 -# Solaris
 -elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null
 -then
--  FIND_PROC="$PS -p \$\$PID | grep -v grep | grep mysqld > /dev/null"
+-  FIND_PROC="$PS -p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
 -# BSD style
 -elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
 -then
--  FIND_PROC="$PS -uaxww | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-  FIND_PROC="$PS -uaxww | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"
 -# SysV style
 -elif $PS -ef 2> /dev/null | grep $0 > /dev/null
 -then
--  FIND_PROC="$PS -ef | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-  FIND_PROC="$PS -ef | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"
 -# Do anybody use this?
 -elif $PS $$ 2> /dev/null | grep $0 > /dev/null
 -then
--  FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
+-  FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
 -else
 -  case $SYSTEM_TYPE in
 -    *freebsd*)
--      FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
+-      FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
 -      ;;
 -    *darwin*)
--      FIND_PROC="$PS -uaxww | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-      FIND_PROC="$PS -uaxww | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"
 -      ;;
 -    *cygwin*)
--      FIND_PROC="$PS -e | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-      FIND_PROC="$PS -e | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"
 -      ;;
--    *netware* | *modesto*)
+-    *netware*)
 -      FIND_PROC=
 -      ;;
 -    *)
 -      AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
 -  esac
 -fi
-+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
++FIND_PROC="$PS -uaxww | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"
  AC_SUBST(FIND_PROC)
  AC_MSG_RESULT("$FIND_PROC")
  
-@@ -847,7 +810,8 @@ AC_ARG_WITH(libwrap,
+@@ -768,7 +731,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.13 2005/12/12 04:55:44 brad Exp $
  int allow_severity = 0;
  int deny_severity  = 0;
  
-@@ -1624,7 +1588,7 @@ then
+@@ -1526,7 +1490,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.13 2005/12/12 04:55:44 brad Exp $
  
    esac
    AC_CHECK_FUNCS(strtok_r pthread_init)
-@@ -1651,29 +1615,6 @@ case $SYSTEM_TYPE in
+@@ -1553,29 +1517,6 @@ case $SYSTEM_TYPE in
  AC_SYS_RESTARTABLE_SYSCALLS
      ;;
  esac
@@ -95,4 +95,4 @@ $OpenBSD: patch-configure_in,v 1.13 2005/12/12 04:55:44 brad Exp $
 -fi
  
  if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
-   DEBUG_CFLAGS="$DEBUG_CFLAGS -DDEBUG -sym internal,codeview4"
+   DEBUG_CFLAGS="-g -DDEBUG -sym internal,codeview4"

databases/mysql/patches/patch-innobase_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-innobase_Makefile_in,v 1.6 2005/01/14 01:42:58 brad Exp $
---- innobase/Makefile.in.orig	Sat Dec 18 12:25:56 2004
-+++ innobase/Makefile.in	Wed Dec 22 10:49:19 2004
-@@ -527,9 +527,9 @@ distcleancheck: distclean
+$OpenBSD: patch-innobase_Makefile_in,v 1.7 2006/01/06 00:13:26 brad Exp $
+--- innobase/Makefile.in.orig	Sat Aug 27 16:35:38 2005
++++ innobase/Makefile.in	Sun Sep  4 19:12:41 2005
+@@ -528,9 +528,9 @@ distcleancheck: distclean
  check-am: all-am
  check: check-recursive
  all-am: Makefile $(HEADERS) ib_config.h

databases/mysql/patches/patch-innobase_include_univ_i

@@ -1,7 +1,7 @@
-$OpenBSD: patch-innobase_include_univ_i,v 1.7 2005/09/04 22:51:24 brad Exp $
---- innobase/include/univ.i.orig	Fri Jul 15 06:39:35 2005
-+++ innobase/include/univ.i	Tue Jul 26 10:22:14 2005
-@@ -122,12 +122,8 @@ by one. */
+$OpenBSD: patch-innobase_include_univ_i,v 1.8 2006/01/06 00:13:26 brad Exp $
+--- innobase/include/univ.i.orig	Thu Sep 22 15:40:08 2005
++++ innobase/include/univ.i	Tue Sep 27 20:04:25 2005
+@@ -127,12 +127,8 @@ by one. */
  #define UNIV_INLINE	__inline
  #else
  /* config.h contains the right def for 'inline' for the current compiler */

databases/mysql/patches/patch-mysql-test_Makefile_in

@@ -1,12 +1,12 @@
-$OpenBSD: patch-mysql-test_Makefile_in,v 1.8 2005/09/04 22:51:24 brad Exp $
---- mysql-test/Makefile.in.orig	Fri Jul 15 06:40:10 2005
-+++ mysql-test/Makefile.in	Tue Jul 26 10:22:14 2005
-@@ -363,7 +363,7 @@ zlib_dir = @zlib_dir@
+$OpenBSD: patch-mysql-test_Makefile_in,v 1.9 2006/01/06 00:13:26 brad Exp $
+--- mysql-test/Makefile.in.orig	Wed Dec 14 18:34:55 2005
++++ mysql-test/Makefile.in	Sun Dec 18 17:36:12 2005
+@@ -382,7 +382,7 @@ zlib_dir = @zlib_dir@
  @HAVE_NDBCLUSTER_DB_TRUE@DIST_SUBDIRS = ndb
  @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
  @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
 -benchdir_root = $(prefix)
 +benchdir_root = $(datadir)
  testdir = $(benchdir_root)/mysql-test
- EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh
+ EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp
  EXTRA_DIST = $(EXTRA_SCRIPTS) 

databases/mysql/patches/patch-scripts_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-scripts_Makefile_in,v 1.1 2005/09/04 22:51:24 brad Exp $
---- scripts/Makefile.in.orig	Wed Aug 17 13:07:45 2005
-+++ scripts/Makefile.in	Sun Sep  4 13:15:54 2005
-@@ -616,6 +616,7 @@ mysqlbug: ${top_builddir}/config.status 
+$OpenBSD: patch-scripts_Makefile_in,v 1.2 2006/01/06 00:13:26 brad Exp $
+--- scripts/Makefile.in.orig	Wed Dec 14 18:35:19 2005
++++ scripts/Makefile.in	Sun Dec 18 17:36:12 2005
+@@ -637,6 +637,7 @@ mysqlbug: ${top_builddir}/config.status 
  	  -e 's!@''datadir''@!$(datadir)!g' \
  	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
  	  -e 's!@''libexecdir''@!$(libexecdir)!g' \

databases/mysql/patches/patch-scripts_mysqld_safe_sh

@@ -1,7 +1,7 @@
-$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.9 2005/10/07 22:48:12 brad Exp $
---- scripts/mysqld_safe.sh.orig	Wed Aug 17 17:06:29 2005
-+++ scripts/mysqld_safe.sh	Fri Oct  7 15:51:03 2005
-@@ -84,50 +84,12 @@ parse_arguments() {
+$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.10 2006/01/06 00:13:26 brad Exp $
+--- scripts/mysqld_safe.sh.orig	Wed Dec 14 18:33:33 2005
++++ scripts/mysqld_safe.sh	Sun Dec 18 17:36:00 2005
+@@ -107,72 +107,12 @@ parse_arguments() {
  }
  
  
@@ -38,7 +38,7 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.9 2005/10/07 22:48:12 brad Exp $
 -if test -d $MY_BASEDIR_VERSION/data/mysql
 -then
 -  DATADIR=$MY_BASEDIR_VERSION/data
--  if test -z "$defaults"
+-  if test -z "$defaults" -a -r "$DATADIR/my.cnf"
 -  then
 -    defaults="--defaults-extra-file=$DATADIR/my.cnf"
 -  fi
@@ -51,13 +51,35 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.9 2005/10/07 22:48:12 brad Exp $
 -  DATADIR=@localstatedir@
 -fi
 -
+-if test -z "$MYSQL_HOME"
+-then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
+-  then
+-    echo "WARNING: Found two instances of my.cnf -"
+-    echo "$MY_BASEDIR_VERSION/my.cnf and"
+-    echo "$DATADIR/my.cnf"
+-    echo "IGNORING $DATADIR/my.cnf"
+-    echo
+-    MYSQL_HOME=$MY_BASEDIR_VERSION
+-  elif test -r "$DATADIR/my.cnf"
+-  then
+-    echo "WARNING: Found $DATADIR/my.cnf"
+-    echo "Datadir is deprecated place for my.cnf, please move it to $MY_BASEDIR_VERSION"
+-    echo
+-    MYSQL_HOME=$DATADIR
+-  else
+-    MYSQL_HOME=$MY_BASEDIR_VERSION
+-  fi
+-fi
+-export MYSQL_HOME
+-
 -user=@MYSQLD_USER@
 +user=_mysql
 +group=_mysql
  niceness=0
  
- # Use the mysqld-max binary by default if the user doesn't specify a binary
-@@ -173,7 +135,8 @@ mysql_unix_port_dir=`dirname $safe_mysql
+ # these rely on $DATADIR by default, so we'll set them later on
+@@ -210,7 +150,8 @@ mysql_unix_port_dir=`dirname $safe_mysql
  if [ ! -d $mysql_unix_port_dir ]
  then
    mkdir $mysql_unix_port_dir
@@ -66,8 +88,8 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.9 2005/10/07 22:48:12 brad Exp $
 +  chmod 711 $mysql_unix_port_dir
  fi
  
- 
-@@ -320,12 +283,6 @@ fi
+ # Use the mysqld-max binary by default if the user doesn't specify a binary
+@@ -367,12 +308,6 @@ fi
  
  echo "Starting $MYSQLD daemon with databases from $DATADIR"
  
@@ -80,7 +102,7 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.9 2005/10/07 22:48:12 brad Exp $
  echo "`date +'%y%m%d %H:%M:%S  mysqld started'`" >> $err_log
  while true
  do
-@@ -342,35 +299,6 @@ do
+@@ -389,35 +324,6 @@ do
      break
    fi
  

databases/mysql/patches/patch-sql_mysqld_cc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-sql_mysqld_cc,v 1.1 2006/01/06 00:13:26 brad Exp $
+--- sql/mysqld.cc.orig	Wed Dec 14 18:33:11 2005
++++ sql/mysqld.cc	Sun Dec 18 17:36:00 2005
+@@ -3306,7 +3306,7 @@ int main(int argc, char **argv)
+   init_ssl();
+ 
+ #ifdef HAVE_LIBWRAP
+-  libwrapName= my_progname+dirname_length(my_progname);
++  libwrapName= (char *) my_progname+dirname_length(my_progname);
+   openlog(libwrapName, LOG_PID, LOG_AUTH);
+ #endif
+ 

databases/mysql/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.27 2005/10/16 18:16:27 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.28 2006/01/06 00:13:27 brad Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -10,10 +10,10 @@ bin/mysqlcheck
 bin/mysqldump
 bin/mysqldumpslow
 bin/mysqlimport
-bin/mysqlmanager-pwgen
-bin/mysqlmanagerc
 bin/mysqlshow
 bin/mysqltest
+bin/mysqltestmanager-pwgen
+bin/mysqltestmanagerc
 include/mysql/
 include/mysql/errmsg.h
 include/mysql/keycache.h
@@ -37,6 +37,7 @@ include/mysql/mysql_com.h
 include/mysql/mysql_embed.h
 include/mysql/mysql_time.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
 include/mysql/sql_common.h
@@ -52,6 +53,11 @@ lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.la
 %%SHARED%%
 @man man/man1/mysql.1
+@man man/man1/mysql_config.1
 @man man/man1/mysqladmin.1
+@man man/man1/mysqlbinlog.1
+@man man/man1/mysqlcheck.1
 @man man/man1/mysqldump.1
+@man man/man1/mysqlimport.1
+@man man/man1/mysqlman.1
 @man man/man1/mysqlshow.1

databases/mysql/pkg/PLIST-server

@@ -1,9 +1,8 @@
-@comment $OpenBSD: PLIST-server,v 1.17 2005/10/16 18:16:27 wilfried Exp $
+@comment $OpenBSD: PLIST-server,v 1.18 2006/01/06 00:13:27 brad Exp $
 @newgroup _mysql:502
 @newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
 bin/comp_err
-bin/isamchk
-bin/isamlog
+bin/innochecksum
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -26,31 +25,35 @@ bin/mysqlbug
 bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqlhotcopy
-bin/pack_isam
 bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
-lib/mysql/libmerge.a
 lib/mysql/libmyisam.a
 lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
-lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-@man man/man1/isamchk.1
-@man man/man1/isamlog.1
+libexec/mysqlmanager
+@man man/man1/msql2mysql.1
+@man man/man1/myisamchk.1
+@man man/man1/myisamlog.1
+@man man/man1/myisampack.1
+@man man/man1/mysql.server.1
 @man man/man1/mysql_fix_privilege_tables.1
 @man man/man1/mysql_zap.1
 @man man/man1/mysqlaccess.1
 @man man/man1/mysqld.1
 @man man/man1/mysqld_multi.1
 @man man/man1/mysqld_safe.1
+@man man/man1/mysqlhotcopy.1
+@man man/man1/mysqlmanager.1
 @man man/man1/perror.1
 @man man/man1/replace.1
+@man man/man1/safe_mysqld.1
 share/mysql/
 share/mysql/binary-configure
 share/mysql/charsets/
@@ -82,44 +85,30 @@ share/mysql/charsets/macroman.xml
 share/mysql/charsets/swe7.xml
 share/mysql/czech/
 share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
 share/mysql/danish/
 share/mysql/danish/errmsg.sys
-share/mysql/danish/errmsg.txt
 share/mysql/dutch/
 share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/english/
 share/mysql/english/errmsg.sys
-share/mysql/english/errmsg.txt
+share/mysql/errmsg.txt
 share/mysql/estonian/
 share/mysql/estonian/errmsg.sys
-share/mysql/estonian/errmsg.txt
 share/mysql/fill_help_tables.sql
 share/mysql/french/
 share/mysql/french/errmsg.sys
-share/mysql/french/errmsg.txt
 share/mysql/german/
 share/mysql/german/errmsg.sys
-share/mysql/german/errmsg.txt
 share/mysql/greek/
 share/mysql/greek/errmsg.sys
-share/mysql/greek/errmsg.txt
 share/mysql/hungarian/
 share/mysql/hungarian/errmsg.sys
-share/mysql/hungarian/errmsg.txt
 share/mysql/italian/
 share/mysql/italian/errmsg.sys
-share/mysql/italian/errmsg.txt
 share/mysql/japanese/
-share/mysql/japanese-sjis/
-share/mysql/japanese-sjis/errmsg.sys
-share/mysql/japanese-sjis/errmsg.txt
 share/mysql/japanese/errmsg.sys
-share/mysql/japanese/errmsg.txt
 share/mysql/korean/
 share/mysql/korean/errmsg.sys
-share/mysql/korean/errmsg.txt
 share/mysql/mi_test_all
 share/mysql/mi_test_all.res
 share/mysql/my-huge.cnf
@@ -134,35 +123,24 @@ share/mysql/ndb-config-2-node.ini
 share/mysql/norwegian/
 share/mysql/norwegian-ny/
 share/mysql/norwegian-ny/errmsg.sys
-share/mysql/norwegian-ny/errmsg.txt
 share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
 share/mysql/polish/
 share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
 share/mysql/portuguese/
 share/mysql/portuguese/errmsg.sys
-share/mysql/portuguese/errmsg.txt
 share/mysql/romanian/
 share/mysql/romanian/errmsg.sys
-share/mysql/romanian/errmsg.txt
 share/mysql/russian/
 share/mysql/russian/errmsg.sys
-share/mysql/russian/errmsg.txt
 share/mysql/serbian/
 share/mysql/serbian/errmsg.sys
-share/mysql/serbian/errmsg.txt
 share/mysql/slovak/
 share/mysql/slovak/errmsg.sys
-share/mysql/slovak/errmsg.txt
 share/mysql/spanish/
 share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
 share/mysql/swedish/
 share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/
 share/mysql/ukrainian/errmsg.sys
-share/mysql/ukrainian/errmsg.txt
 @extraunexec rm -rf ${DB_DIR}
 @extraunexec rm -rf ${SOCKET_DIR}

databases/mysql/pkg/PLIST-tests

@@ -1,16 +1,21 @@
-@comment $OpenBSD: PLIST-tests,v 1.15 2005/12/12 04:55:44 brad Exp $
+@comment $OpenBSD: PLIST-tests,v 1.16 2006/01/06 00:13:27 brad Exp $
 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/big_test.inc
 share/mysql-test/include/check_var_limit.inc
+share/mysql-test/include/common-tests.inc
 share/mysql-test/include/ctype_common.inc
 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/endspace.inc
+share/mysql-test/include/federated.inc
+share/mysql-test/include/federated_cleanup.inc
+share/mysql-test/include/gis_generic.inc
 share/mysql-test/include/have_archive.inc
 share/mysql-test/include/have_bdb.inc
 share/mysql-test/include/have_big5.inc
@@ -21,25 +26,28 @@ share/mysql-test/include/have_cp932.inc
 share/mysql-test/include/have_crypt.inc
 share/mysql-test/include/have_csv.inc
 share/mysql-test/include/have_debug.inc
+share/mysql-test/include/have_eucjpms.inc
 share/mysql-test/include/have_exampledb.inc
+share/mysql-test/include/have_federated_db.inc
 share/mysql-test/include/have_gbk.inc
 share/mysql-test/include/have_geometry.inc
 share/mysql-test/include/have_innodb.inc
-share/mysql-test/include/have_isam.inc
 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_openssl_1.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_tis620.inc
 share/mysql-test/include/have_ucs2.inc
 share/mysql-test/include/have_ujis.inc
+share/mysql-test/include/im_check_os.inc
+share/mysql-test/include/is_debug_build.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/mysqltest-x.inc
 share/mysql-test/include/mysqltest_while.inc
+share/mysql-test/include/ndb_default_cluster.inc
 share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/not_openssl.inc
 share/mysql-test/include/not_windows.inc
@@ -50,8 +58,13 @@ share/mysql-test/include/ps_modify1.inc
 share/mysql-test/include/ps_query.inc
 share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/show_msg.inc
+share/mysql-test/include/show_msg80.inc
+share/mysql-test/include/sp-vars.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_outfile.inc
+share/mysql-test/include/testdb_only.inc
+share/mysql-test/include/varchar.inc
 share/mysql-test/include/windows.inc
 share/mysql-test/install_test_db
 share/mysql-test/lib/
@@ -65,6 +78,7 @@ share/mysql-test/lib/mtr_match.pl
 share/mysql-test/lib/mtr_misc.pl
 share/mysql-test/lib/mtr_process.pl
 share/mysql-test/lib/mtr_report.pl
+share/mysql-test/lib/mtr_stress.pl
 share/mysql-test/lib/mtr_timer.pl
 share/mysql-test/mysql-test-run
 share/mysql-test/r/
@@ -74,6 +88,7 @@ share/mysql-test/r/analyse.result
 share/mysql-test/r/analyze.result
 share/mysql-test/r/ansi.result
 share/mysql-test/r/archive.result
+share/mysql-test/r/archive_gis.result
 share/mysql-test/r/auto_increment.result
 share/mysql-test/r/backup.result
 share/mysql-test/r/bdb-alter-table-1.result
@@ -82,10 +97,12 @@ share/mysql-test/r/bdb-crash.result
 share/mysql-test/r/bdb-deadlock.result
 share/mysql-test/r/bdb.result
 share/mysql-test/r/bdb_cache.result
+share/mysql-test/r/bdb_gis.result
 share/mysql-test/r/bench_count_distinct.result
 share/mysql-test/r/big_test.require
 share/mysql-test/r/bigint.result
 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/bulk_replace.result
@@ -93,8 +110,10 @@ share/mysql-test/r/case.result
 share/mysql-test/r/cast.result
 share/mysql-test/r/check.result
 share/mysql-test/r/check_var_limit.require
+share/mysql-test/r/client_xml.result
 share/mysql-test/r/comments.result
 share/mysql-test/r/compare.result
+share/mysql-test/r/compress.result
 share/mysql-test/r/connect.result
 share/mysql-test/r/consistent_snapshot.result
 share/mysql-test/r/constraints.result
@@ -109,7 +128,9 @@ share/mysql-test/r/ctype_collate.result
 share/mysql-test/r/ctype_cp1250_ch.result
 share/mysql-test/r/ctype_cp1251.result
 share/mysql-test/r/ctype_cp932.result
+share/mysql-test/r/ctype_cp932_binlog.result
 share/mysql-test/r/ctype_create.result
+share/mysql-test/r/ctype_eucjpms.result
 share/mysql-test/r/ctype_gbk.result
 share/mysql-test/r/ctype_latin1.result
 share/mysql-test/r/ctype_latin1_de.result
@@ -125,6 +146,7 @@ share/mysql-test/r/ctype_ucs_binlog.result
 share/mysql-test/r/ctype_ujis.result
 share/mysql-test/r/ctype_utf8.result
 share/mysql-test/r/date_formats.result
+share/mysql-test/r/default.result
 share/mysql-test/r/delayed.result
 share/mysql-test/r/delete.result
 share/mysql-test/r/derived.result
@@ -137,8 +159,12 @@ share/mysql-test/r/endspace.result
 share/mysql-test/r/errors.result
 share/mysql-test/r/exampledb.result
 share/mysql-test/r/explain.result
+share/mysql-test/r/federated.result
+share/mysql-test/r/federated_archive.result
+share/mysql-test/r/federated_bug_13118.result
 share/mysql-test/r/flush.result
 share/mysql-test/r/flush_block_commit.result
+share/mysql-test/r/flush_read_lock_kill.result
 share/mysql-test/r/flush_table.result
 share/mysql-test/r/foreign_key.result
 share/mysql-test/r/fulltext.result
@@ -181,8 +207,11 @@ share/mysql-test/r/gis-rtree.result
 share/mysql-test/r/gis.result
 share/mysql-test/r/grant.result
 share/mysql-test/r/grant2.result
+share/mysql-test/r/grant3.result
 share/mysql-test/r/grant_cache.result
+share/mysql-test/r/greedy_optimizer.result
 share/mysql-test/r/group_by.result
+share/mysql-test/r/group_min_max.result
 share/mysql-test/r/handler.result
 share/mysql-test/r/have_archive.require
 share/mysql-test/r/have_bdb.require
@@ -194,16 +223,16 @@ share/mysql-test/r/have_cp932.require
 share/mysql-test/r/have_crypt.require
 share/mysql-test/r/have_csv.require
 share/mysql-test/r/have_debug.require
+share/mysql-test/r/have_eucjpms.require
 share/mysql-test/r/have_exampledb.require
+share/mysql-test/r/have_federated_db.require
 share/mysql-test/r/have_gbk.require
 share/mysql-test/r/have_geometry.require
 share/mysql-test/r/have_innodb.require
-share/mysql-test/r/have_isam.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_ndb.require
 share/mysql-test/r/have_openssl.require
-share/mysql-test/r/have_openssl_1.require
 share/mysql-test/r/have_outfile.require
 share/mysql-test/r/have_query_cache.require
 share/mysql-test/r/have_raid.require
@@ -218,20 +247,38 @@ share/mysql-test/r/heap_auto_increment.result
 share/mysql-test/r/heap_btree.result
 share/mysql-test/r/heap_hash.result
 share/mysql-test/r/help.result
+share/mysql-test/r/im_daemon_life_cycle.result
+share/mysql-test/r/im_life_cycle.result
+share/mysql-test/r/im_options_set.result
+share/mysql-test/r/im_options_unset.result
+share/mysql-test/r/im_utils.result
+share/mysql-test/r/index_merge.result
+share/mysql-test/r/index_merge_bdb.result
+share/mysql-test/r/index_merge_innodb.result
+share/mysql-test/r/index_merge_innodb2.result
+share/mysql-test/r/index_merge_ror.result
+share/mysql-test/r/index_merge_ror_cpk.result
+share/mysql-test/r/information_schema.result
+share/mysql-test/r/information_schema_db.result
+share/mysql-test/r/information_schema_inno.result
 share/mysql-test/r/init_connect.result
+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.result
 share/mysql-test/r/innodb_cache.result
+share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_handler.result
 share/mysql-test/r/insert.result
 share/mysql-test/r/insert_select-binlog.result
 share/mysql-test/r/insert_select.result
 share/mysql-test/r/insert_update.result
+share/mysql-test/r/is_debug_build.require
 share/mysql-test/r/isam.result
 share/mysql-test/r/join.result
 share/mysql-test/r/join_crash.result
+share/mysql-test/r/join_nested.result
 share/mysql-test/r/join_outer.result
 share/mysql-test/r/key.result
 share/mysql-test/r/key_cache.result
@@ -251,6 +298,7 @@ share/mysql-test/r/lowercase_table2.result
 share/mysql-test/r/lowercase_table3.result
 share/mysql-test/r/lowercase_table_grant.result
 share/mysql-test/r/lowercase_table_qcache.result
+share/mysql-test/r/lowercase_view.result
 share/mysql-test/r/merge.result
 share/mysql-test/r/metadata.result
 share/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -258,20 +306,31 @@ share/mysql-test/r/multi_statement.result
 share/mysql-test/r/multi_update.result
 share/mysql-test/r/myisam-blob.result
 share/mysql-test/r/myisam.result
+share/mysql-test/r/mysql.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
+share/mysql-test/r/mysqlcheck.result
+share/mysql-test/r/mysqldump-max.result
 share/mysql-test/r/mysqldump.result
+share/mysql-test/r/mysqlshow.result
 share/mysql-test/r/mysqltest.result
 share/mysql-test/r/ndb_alter_table.result
 share/mysql-test/r/ndb_autodiscover.result
 share/mysql-test/r/ndb_autodiscover2.result
 share/mysql-test/r/ndb_basic.result
+share/mysql-test/r/ndb_bitfield.result
 share/mysql-test/r/ndb_blob.result
 share/mysql-test/r/ndb_cache.result
+share/mysql-test/r/ndb_cache2.result
+share/mysql-test/r/ndb_cache_multi.result
+share/mysql-test/r/ndb_cache_multi2.result
 share/mysql-test/r/ndb_charset.result
+share/mysql-test/r/ndb_condition_pushdown.result
 share/mysql-test/r/ndb_config.result
 share/mysql-test/r/ndb_database.result
+share/mysql-test/r/ndb_default_cluster.require
+share/mysql-test/r/ndb_gis.result
 share/mysql-test/r/ndb_grant.result
 share/mysql-test/r/ndb_index.result
 share/mysql-test/r/ndb_index_ordered.result
@@ -281,6 +340,7 @@ share/mysql-test/r/ndb_limit.result
 share/mysql-test/r/ndb_lock.result
 share/mysql-test/r/ndb_minmax.result
 share/mysql-test/r/ndb_multi.result
+share/mysql-test/r/ndb_read_multi_range.result
 share/mysql-test/r/ndb_replace.result
 share/mysql-test/r/ndb_restore.result
 share/mysql-test/r/ndb_subquery.result
@@ -320,11 +380,14 @@ share/mysql-test/r/query_cache_merge.result
 share/mysql-test/r/query_cache_notembedded.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
+share/mysql-test/r/read_only.result
 share/mysql-test/r/rename.result
 share/mysql-test/r/repair.result
 share/mysql-test/r/replace.result
 share/mysql-test/r/rollback.result
 share/mysql-test/r/row.result
+share/mysql-test/r/rowid_order_bdb.result
+share/mysql-test/r/rowid_order_innodb.result
 share/mysql-test/r/rpl000001.result
 share/mysql-test/r/rpl000002.result
 share/mysql-test/r/rpl000004.result
@@ -341,6 +404,7 @@ share/mysql-test/r/rpl000017.result
 share/mysql-test/r/rpl000018.result
 share/mysql-test/r/rpl_EE_error.result
 share/mysql-test/r/rpl_alter.result
+share/mysql-test/r/rpl_auto_increment.result
 share/mysql-test/r/rpl_chain_temp_table.result
 share/mysql-test/r/rpl_change_master.result
 share/mysql-test/r/rpl_charset.result
@@ -353,6 +417,7 @@ share/mysql-test/r/rpl_do_grant.result
 share/mysql-test/r/rpl_drop.result
 share/mysql-test/r/rpl_drop_db.result
 share/mysql-test/r/rpl_drop_temp.result
+share/mysql-test/r/rpl_dual_pos_advance.result
 share/mysql-test/r/rpl_empty_master_crash.result
 share/mysql-test/r/rpl_error_ignored_table.result
 share/mysql-test/r/rpl_failed_optimize.result
@@ -397,42 +462,74 @@ share/mysql-test/r/rpl_rewrite_db.result
 share/mysql-test/r/rpl_rotate_logs.result
 share/mysql-test/r/rpl_server_id1.result
 share/mysql-test/r/rpl_server_id2.result
+share/mysql-test/r/rpl_session_var.result
 share/mysql-test/r/rpl_set_charset.result
 share/mysql-test/r/rpl_skip_error.result
 share/mysql-test/r/rpl_slave_status.result
+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_start_stop_slave.result
 share/mysql-test/r/rpl_temporary.result
 share/mysql-test/r/rpl_timezone.result
-share/mysql-test/r/rpl_trunc_binlog.result
+share/mysql-test/r/rpl_trigger.result
 share/mysql-test/r/rpl_until.result
 share/mysql-test/r/rpl_user_variables.result
 share/mysql-test/r/rpl_variables.result
+share/mysql-test/r/rpl_view.result
+share/mysql-test/r/schema.result
 share/mysql-test/r/select.result
 share/mysql-test/r/select_found.result
 share/mysql-test/r/select_safe.result
+share/mysql-test/r/server_id.require
+share/mysql-test/r/server_id1.require
 share/mysql-test/r/show_check.result
+share/mysql-test/r/skip_grants.result
 share/mysql-test/r/skip_name_resolve.result
 share/mysql-test/r/slave-running.result
 share/mysql-test/r/slave-stopped.result
+share/mysql-test/r/sp-big.result
+share/mysql-test/r/sp-code.result
+share/mysql-test/r/sp-destruct.result
+share/mysql-test/r/sp-dynamic.result
+share/mysql-test/r/sp-error.result
+share/mysql-test/r/sp-goto.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-vars.result
+share/mysql-test/r/sp.result
+share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sql_mode.result
+share/mysql-test/r/ssl.result
+share/mysql-test/r/ssl_compress.result
 share/mysql-test/r/status.result
+share/mysql-test/r/strict.result
 share/mysql-test/r/subselect.result
 share/mysql-test/r/subselect2.result
 share/mysql-test/r/subselect_gis.result
 share/mysql-test/r/subselect_innodb.result
+share/mysql-test/r/sum_distinct-big.result
+share/mysql-test/r/sum_distinct.result
 share/mysql-test/r/symlink.result
 share/mysql-test/r/synchronization.result
 share/mysql-test/r/system_mysql_db.result
 share/mysql-test/r/system_mysql_db_refs.result
 share/mysql-test/r/tablelock.result
 share/mysql-test/r/temp_table.result
+share/mysql-test/r/testdb_only.require
 share/mysql-test/r/timezone.result
 share/mysql-test/r/timezone2.result
 share/mysql-test/r/timezone3.result
 share/mysql-test/r/timezone_grant.result
+share/mysql-test/r/trigger-compat.result
+share/mysql-test/r/trigger-grant.result
+share/mysql-test/r/trigger.result
 share/mysql-test/r/true.require
 share/mysql-test/r/truncate.result
+share/mysql-test/r/type_binary.result
+share/mysql-test/r/type_bit.result
+share/mysql-test/r/type_bit_innodb.result
 share/mysql-test/r/type_blob.result
 share/mysql-test/r/type_date.result
 share/mysql-test/r/type_datetime.result
@@ -440,20 +537,29 @@ share/mysql-test/r/type_decimal.result
 share/mysql-test/r/type_enum.result
 share/mysql-test/r/type_float.result
 share/mysql-test/r/type_nchar.result
+share/mysql-test/r/type_newdecimal-big.result
+share/mysql-test/r/type_newdecimal.result
 share/mysql-test/r/type_ranges.result
 share/mysql-test/r/type_set.result
 share/mysql-test/r/type_time.result
 share/mysql-test/r/type_timestamp.result
 share/mysql-test/r/type_uint.result
+share/mysql-test/r/type_varchar.result
 share/mysql-test/r/type_year.result
 share/mysql-test/r/union.result
 share/mysql-test/r/update.result
+share/mysql-test/r/user_limits.result
 share/mysql-test/r/user_var-binlog.result
 share/mysql-test/r/user_var.result
 share/mysql-test/r/varbinary.result
 share/mysql-test/r/variables.result
+share/mysql-test/r/view.result
+share/mysql-test/r/view_grant.result
+share/mysql-test/r/view_query_cache.result
+share/mysql-test/r/wait_timeout.result
 share/mysql-test/r/warnings.result
 share/mysql-test/r/windows.result
+share/mysql-test/r/xa.result
 share/mysql-test/server-cert.pem
 share/mysql-test/server-key.pem
 share/mysql-test/std_data/
@@ -467,13 +573,19 @@ share/mysql-test/std_data/loaddata1.dat
 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/loaddata_dq.dat
 share/mysql-test/std_data/loaddata_pair.dat
 share/mysql-test/std_data/master-bin.000001
+share/mysql-test/std_data/ndb_config_mycnf1.cnf
+share/mysql-test/std_data/ndb_config_mycnf2.cnf
 share/mysql-test/std_data/rpl_loaddata.dat
 share/mysql-test/std_data/rpl_loaddata2.dat
+share/mysql-test/std_data/rpl_timezone.dat
 share/mysql-test/std_data/server-cert.pem
 share/mysql-test/std_data/server-key.pem
 share/mysql-test/std_data/trunc_binlog.000001
+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/t/
@@ -483,6 +595,7 @@ share/mysql-test/t/analyse.test
 share/mysql-test/t/analyze.test
 share/mysql-test/t/ansi.test
 share/mysql-test/t/archive.test
+share/mysql-test/t/archive_gis.test
 share/mysql-test/t/auto_increment.test
 share/mysql-test/t/backup-master.sh
 share/mysql-test/t/backup.test
@@ -494,17 +607,22 @@ share/mysql-test/t/bdb-deadlock.test
 share/mysql-test/t/bdb.test
 share/mysql-test/t/bdb_cache-master.opt
 share/mysql-test/t/bdb_cache.test
+share/mysql-test/t/bdb_gis.test
 share/mysql-test/t/bench_count_distinct.test
 share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
+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/bulk_replace.test
 share/mysql-test/t/case.test
 share/mysql-test/t/cast.test
 share/mysql-test/t/check.test
+share/mysql-test/t/client_xml.test
 share/mysql-test/t/comments.test
 share/mysql-test/t/compare.test
+share/mysql-test/t/compress.test
 share/mysql-test/t/connect.test
 share/mysql-test/t/consistent_snapshot.test
 share/mysql-test/t/constraints.test
@@ -520,7 +638,9 @@ share/mysql-test/t/ctype_collate.test
 share/mysql-test/t/ctype_cp1250_ch.test
 share/mysql-test/t/ctype_cp1251.test
 share/mysql-test/t/ctype_cp932.test
+share/mysql-test/t/ctype_cp932_binlog.test
 share/mysql-test/t/ctype_create.test
+share/mysql-test/t/ctype_eucjpms.test
 share/mysql-test/t/ctype_gbk.test
 share/mysql-test/t/ctype_latin1.test
 share/mysql-test/t/ctype_latin1_de-master.opt
@@ -538,6 +658,7 @@ share/mysql-test/t/ctype_ujis.test
 share/mysql-test/t/ctype_utf8.test
 share/mysql-test/t/date_formats-master.opt
 share/mysql-test/t/date_formats.test
+share/mysql-test/t/default.test
 share/mysql-test/t/delayed.test
 share/mysql-test/t/delete.test
 share/mysql-test/t/derived.test
@@ -551,8 +672,13 @@ share/mysql-test/t/endspace.test
 share/mysql-test/t/errors.test
 share/mysql-test/t/exampledb.test
 share/mysql-test/t/explain.test
+share/mysql-test/t/federated.test
+share/mysql-test/t/federated_archive.test
+share/mysql-test/t/federated_bug_13118.test
 share/mysql-test/t/flush.test
 share/mysql-test/t/flush_block_commit.test
+share/mysql-test/t/flush_read_lock_kill-master.opt
+share/mysql-test/t/flush_read_lock_kill.test
 share/mysql-test/t/flush_table.test
 share/mysql-test/t/foreign_key.test
 share/mysql-test/t/fulltext.test
@@ -596,8 +722,12 @@ share/mysql-test/t/gis-rtree.test
 share/mysql-test/t/gis.test
 share/mysql-test/t/grant.test
 share/mysql-test/t/grant2.test
+share/mysql-test/t/grant3-master.opt
+share/mysql-test/t/grant3.test
 share/mysql-test/t/grant_cache.test
+share/mysql-test/t/greedy_optimizer.test
 share/mysql-test/t/group_by.test
+share/mysql-test/t/group_min_max.test
 share/mysql-test/t/handler.test
 share/mysql-test/t/having.test
 share/mysql-test/t/heap.test
@@ -605,10 +735,26 @@ share/mysql-test/t/heap_auto_increment.test
 share/mysql-test/t/heap_btree.test
 share/mysql-test/t/heap_hash.test
 share/mysql-test/t/help.test
+share/mysql-test/t/im_daemon_life_cycle-im.opt
+share/mysql-test/t/im_daemon_life_cycle.imtest
+share/mysql-test/t/im_life_cycle.imtest
+share/mysql-test/t/im_options_set.imtest
+share/mysql-test/t/im_options_unset.imtest
+share/mysql-test/t/im_utils.imtest
+share/mysql-test/t/index_merge.test
+share/mysql-test/t/index_merge_bdb.test
+share/mysql-test/t/index_merge_innodb.test
+share/mysql-test/t/index_merge_innodb2.test
+share/mysql-test/t/index_merge_ror.test
+share/mysql-test/t/index_merge_ror_cpk.test
+share/mysql-test/t/information_schema.test
+share/mysql-test/t/information_schema_db.test
+share/mysql-test/t/information_schema_inno.test
 share/mysql-test/t/init_connect-master.opt
 share/mysql-test/t/init_connect.test
 share/mysql-test/t/init_file-master.opt
 share/mysql-test/t/init_file.test
+share/mysql-test/t/innodb-big.test
 share/mysql-test/t/innodb-deadlock.test
 share/mysql-test/t/innodb-lock.test
 share/mysql-test/t/innodb-master.opt
@@ -616,14 +762,15 @@ share/mysql-test/t/innodb-replace.test
 share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
+share/mysql-test/t/innodb_gis.test
 share/mysql-test/t/innodb_handler.test
 share/mysql-test/t/insert.test
 share/mysql-test/t/insert_select-binlog.test
 share/mysql-test/t/insert_select.test
 share/mysql-test/t/insert_update.test
-share/mysql-test/t/isam.test
 share/mysql-test/t/join.test
 share/mysql-test/t/join_crash.test
+share/mysql-test/t/join_nested.test
 share/mysql-test/t/join_outer.test
 share/mysql-test/t/key.test
 share/mysql-test/t/key_cache-master.opt
@@ -632,6 +779,7 @@ share/mysql-test/t/key_diff.test
 share/mysql-test/t/key_primary.test
 share/mysql-test/t/keywords.test
 share/mysql-test/t/kill.test
+share/mysql-test/t/kill_n_check.sh
 share/mysql-test/t/limit.test
 share/mysql-test/t/loaddata.test
 share/mysql-test/t/lock.test
@@ -647,6 +795,8 @@ share/mysql-test/t/lowercase_table_grant-master.opt
 share/mysql-test/t/lowercase_table_grant.test
 share/mysql-test/t/lowercase_table_qcache-master.opt
 share/mysql-test/t/lowercase_table_qcache.test
+share/mysql-test/t/lowercase_view-master.opt
+share/mysql-test/t/lowercase_view.test
 share/mysql-test/t/merge.test
 share/mysql-test/t/metadata.test
 share/mysql-test/t/mix_innodb_myisam_binlog-master.opt
@@ -658,23 +808,35 @@ share/mysql-test/t/multi_update.test
 share/mysql-test/t/myisam-blob-master.opt
 share/mysql-test/t/myisam-blob.test
 share/mysql-test/t/myisam.test
+share/mysql-test/t/mysql.test
 share/mysql-test/t/mysql_client_test.test
+share/mysql-test/t/mysql_delimiter.sql
+share/mysql-test/t/mysql_delimiter_source.sql
 share/mysql-test/t/mysql_protocols.test
 share/mysql-test/t/mysqlbinlog-master.opt
 share/mysql-test/t/mysqlbinlog.test
 share/mysql-test/t/mysqlbinlog2.test
+share/mysql-test/t/mysqlcheck.test
+share/mysql-test/t/mysqldump-max.test
 share/mysql-test/t/mysqldump.test
+share/mysql-test/t/mysqlshow.test
 share/mysql-test/t/mysqltest.test
 share/mysql-test/t/ndb_alter_table.test
 share/mysql-test/t/ndb_autodiscover.test
 share/mysql-test/t/ndb_autodiscover2-master.opt
 share/mysql-test/t/ndb_autodiscover2.test
 share/mysql-test/t/ndb_basic.test
+share/mysql-test/t/ndb_bitfield.test
 share/mysql-test/t/ndb_blob.test
 share/mysql-test/t/ndb_cache.test
+share/mysql-test/t/ndb_cache2.test
+share/mysql-test/t/ndb_cache_multi.test
+share/mysql-test/t/ndb_cache_multi2.test
 share/mysql-test/t/ndb_charset.test
+share/mysql-test/t/ndb_condition_pushdown.test
 share/mysql-test/t/ndb_config.test
 share/mysql-test/t/ndb_database.test
+share/mysql-test/t/ndb_gis.test
 share/mysql-test/t/ndb_index.test
 share/mysql-test/t/ndb_index_ordered.test
 share/mysql-test/t/ndb_index_unique.test
@@ -683,6 +845,7 @@ share/mysql-test/t/ndb_limit.test
 share/mysql-test/t/ndb_lock.test
 share/mysql-test/t/ndb_minmax.test
 share/mysql-test/t/ndb_multi.test
+share/mysql-test/t/ndb_read_multi_range.test
 share/mysql-test/t/ndb_replace.test
 share/mysql-test/t/ndb_restore.test
 share/mysql-test/t/ndb_subquery.test
@@ -691,6 +854,7 @@ share/mysql-test/t/ndb_truncate.test
 share/mysql-test/t/ndb_types.test
 share/mysql-test/t/ndb_update.test
 share/mysql-test/t/negation_elimination.test
+share/mysql-test/t/not_embedded_server-master.opt
 share/mysql-test/t/not_embedded_server.test
 share/mysql-test/t/null.test
 share/mysql-test/t/null_key.test
@@ -720,11 +884,14 @@ share/mysql-test/t/query_cache_merge.test
 share/mysql-test/t/query_cache_notembedded.test
 share/mysql-test/t/raid.test
 share/mysql-test/t/range.test
+share/mysql-test/t/read_only.test
 share/mysql-test/t/rename.test
 share/mysql-test/t/repair.test
 share/mysql-test/t/replace.test
 share/mysql-test/t/rollback.test
 share/mysql-test/t/row.test
+share/mysql-test/t/rowid_order_bdb.test
+share/mysql-test/t/rowid_order_innodb.test
 share/mysql-test/t/rpl000001-slave.opt
 share/mysql-test/t/rpl000001.test
 share/mysql-test/t/rpl000002.test
@@ -752,6 +919,8 @@ share/mysql-test/t/rpl000018-slave.opt
 share/mysql-test/t/rpl000018.test
 share/mysql-test/t/rpl_EE_error.test
 share/mysql-test/t/rpl_alter.test
+share/mysql-test/t/rpl_auto_increment-master.opt
+share/mysql-test/t/rpl_auto_increment.test
 share/mysql-test/t/rpl_chain_temp_table.test
 share/mysql-test/t/rpl_change_master.test
 share/mysql-test/t/rpl_charset.test
@@ -768,6 +937,8 @@ share/mysql-test/t/rpl_drop.test
 share/mysql-test/t/rpl_drop_db.test
 share/mysql-test/t/rpl_drop_temp-slave.opt
 share/mysql-test/t/rpl_drop_temp.test
+share/mysql-test/t/rpl_dual_pos_advance-master.opt
+share/mysql-test/t/rpl_dual_pos_advance.test
 share/mysql-test/t/rpl_empty_master_crash.test
 share/mysql-test/t/rpl_error_ignored_table-slave.opt
 share/mysql-test/t/rpl_error_ignored_table.test
@@ -839,10 +1010,17 @@ share/mysql-test/t/rpl_rotate_logs.test
 share/mysql-test/t/rpl_server_id1.test
 share/mysql-test/t/rpl_server_id2-slave.opt
 share/mysql-test/t/rpl_server_id2.test
+share/mysql-test/t/rpl_session_var.test
 share/mysql-test/t/rpl_set_charset.test
 share/mysql-test/t/rpl_skip_error-slave.opt
 share/mysql-test/t/rpl_skip_error.test
 share/mysql-test/t/rpl_slave_status.test
+share/mysql-test/t/rpl_sp-master.opt
+share/mysql-test/t/rpl_sp-slave.opt
+share/mysql-test/t/rpl_sp.test
+share/mysql-test/t/rpl_sp_effects-master.opt
+share/mysql-test/t/rpl_sp_effects-slave.opt
+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_start_stop_slave.test
@@ -850,22 +1028,44 @@ share/mysql-test/t/rpl_temporary.test
 share/mysql-test/t/rpl_timezone-master.opt
 share/mysql-test/t/rpl_timezone-slave.opt
 share/mysql-test/t/rpl_timezone.test
-share/mysql-test/t/rpl_trunc_binlog.test
+share/mysql-test/t/rpl_trigger.test
 share/mysql-test/t/rpl_until.test
 share/mysql-test/t/rpl_user_variables.test
+share/mysql-test/t/rpl_variables-master.opt
 share/mysql-test/t/rpl_variables.test
+share/mysql-test/t/rpl_view.test
+share/mysql-test/t/schema.test
 share/mysql-test/t/select.test
 share/mysql-test/t/select_found.test
 share/mysql-test/t/select_safe.test
 share/mysql-test/t/show_check.test
+share/mysql-test/t/skip_grants-master.opt
+share/mysql-test/t/skip_grants.test
 share/mysql-test/t/skip_name_resolve-master.opt
 share/mysql-test/t/skip_name_resolve.test
+share/mysql-test/t/sp-big.test
+share/mysql-test/t/sp-code.test
+share/mysql-test/t/sp-destruct.test
+share/mysql-test/t/sp-dynamic.test
+share/mysql-test/t/sp-error.test
+share/mysql-test/t/sp-goto.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-vars.test
+share/mysql-test/t/sp.test
+share/mysql-test/t/sp_trans.test
 share/mysql-test/t/sql_mode.test
+share/mysql-test/t/ssl.test
+share/mysql-test/t/ssl_compress.test
 share/mysql-test/t/status.test
+share/mysql-test/t/strict.test
 share/mysql-test/t/subselect.test
 share/mysql-test/t/subselect2.test
 share/mysql-test/t/subselect_gis.test
 share/mysql-test/t/subselect_innodb.test
+share/mysql-test/t/sum_distinct-big.test
+share/mysql-test/t/sum_distinct.test
 share/mysql-test/t/symlink.test
 share/mysql-test/t/synchronization.test
 share/mysql-test/t/system_mysql_db.test
@@ -881,7 +1081,13 @@ share/mysql-test/t/timezone2.test
 share/mysql-test/t/timezone3-master.opt
 share/mysql-test/t/timezone3.test
 share/mysql-test/t/timezone_grant.test
+share/mysql-test/t/trigger-compat.test
+share/mysql-test/t/trigger-grant.test
+share/mysql-test/t/trigger.test
 share/mysql-test/t/truncate.test
+share/mysql-test/t/type_binary.test
+share/mysql-test/t/type_bit.test
+share/mysql-test/t/type_bit_innodb.test
 share/mysql-test/t/type_blob.test
 share/mysql-test/t/type_date.test
 share/mysql-test/t/type_datetime.test
@@ -889,20 +1095,30 @@ share/mysql-test/t/type_decimal.test
 share/mysql-test/t/type_enum.test
 share/mysql-test/t/type_float.test
 share/mysql-test/t/type_nchar.test
+share/mysql-test/t/type_newdecimal-big.test
+share/mysql-test/t/type_newdecimal.test
 share/mysql-test/t/type_ranges.test
 share/mysql-test/t/type_set.test
 share/mysql-test/t/type_time.test
 share/mysql-test/t/type_timestamp.test
 share/mysql-test/t/type_uint.test
+share/mysql-test/t/type_varchar.test
 share/mysql-test/t/type_year.test
 share/mysql-test/t/union-master.opt
 share/mysql-test/t/union.test
 share/mysql-test/t/update.test
+share/mysql-test/t/user_limits.test
 share/mysql-test/t/user_var-binlog.test
 share/mysql-test/t/user_var.test
 share/mysql-test/t/varbinary.test
 share/mysql-test/t/variables-master.opt
 share/mysql-test/t/variables.test
+share/mysql-test/t/view.test
+share/mysql-test/t/view_grant.test
+share/mysql-test/t/view_query_cache.test
+share/mysql-test/t/wait_timeout-master.opt
+share/mysql-test/t/wait_timeout.test
 share/mysql-test/t/warnings-master.opt
 share/mysql-test/t/warnings.test
 share/mysql-test/t/windows.test
+share/mysql-test/t/xa.test