cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to MySQL 4.0.23

Browse Source 
fixes some crashing issues among many other bug fixes,
seems to have resolved a crashing issue henning@ was
experiencing on sparc64.
This commit is contained in:
brad 2005-01-14 01:42:58 +00:00
parent 1be340ee85
commit 1337fc6ca9
27 changed files with 176 additions and 534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
databases/mysql/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.102 2004/11/22 16:59:29 espie Exp $
# $OpenBSD: Makefile,v 1.103 2005/01/14 01:42:58 brad Exp $
# Uses pthreads
.if ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "m88k"
@ -9,10 +9,10 @@ COMMENT= "multithreaded SQL database (client)"
COMMENT-server= "multithreaded SQL database (server)"
COMMENT-tests= "multithreaded SQL database (regression test suite)"
VERSION= 4.0.20
VERSION= 4.0.23
DISTNAME= mysql-${VERSION}
FULLPKGNAME= mysql-client-${VERSION}p1
PKGNAME-server= mysql-server-${VERSION}p1
FULLPKGNAME= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}
FULLPKGNAME-tests= mysql-tests-${VERSION}
CATEGORIES= databases
V= MySQL-4.0
@ -42,7 +42,7 @@ VMEM_WARNING= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.57
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-thread-safe-client \
--localstatedir="${DB_DIR}" \

7
databases/mysql/distinfo
View File

@ -1,4 +1,3 @@
MD5 (mysql-4.0.20.tar.gz) = 7c75ac74e23396bd228dbc2c2d1131df
RMD160 (mysql-4.0.20.tar.gz) = 266a20c1711fd946a567c9de8d65acb60b583760
SHA1 (mysql-4.0.20.tar.gz) = e60d11b14ea97f3b95cd50e2c46cb664f729e3d8
SIZE (mysql-4.0.20.tar.gz) = 13807983
MD5 (mysql-4.0.23.tar.gz) = 8b3a40434348f961b71715ed45fe540e
RMD160 (mysql-4.0.23.tar.gz) = a2b5ec585fbe0b91ca0b753b432566e15d46691b
SHA1 (mysql-4.0.23.tar.gz) = 64aa9e7cf8f4f4ee370653d2237bff38925d5a59

18
databases/mysql/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.9 2004/07/18 11:38:23 espie Exp $
--- configure.in.orig Fri May 14 02:53:30 2004
+++ configure.in Sun Jul 18 09:30:44 2004
@@ -437,41 +437,7 @@ AC_SUBST(PERL5)
$OpenBSD: patch-configure_in,v 1.10 2005/01/14 01:42:58 brad Exp $
--- configure.in.orig Sat Dec 18 12:25:07 2004
+++ configure.in Wed Dec 22 10:48:19 2004
@@ -439,41 +439,7 @@ AC_SUBST(PERL5)
AC_PATH_PROG(PS, ps, ps)
AC_MSG_CHECKING("how to check if pid exists")
PS=$ac_cv_path_PS
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.9 2004/07/18 11:38:23 espie Exp $
-then
- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
-# Solaris
-elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
-elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null
-then
- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
-# BSD style
@ -44,7 +44,7 @@ $OpenBSD: patch-configure_in,v 1.9 2004/07/18 11:38:23 espie Exp $
AC_SUBST(FIND_PROC)
AC_MSG_RESULT("$FIND_PROC")
@@ -788,7 +754,8 @@ AC_ARG_WITH(libwrap,
@@ -797,7 +763,8 @@ AC_ARG_WITH(libwrap,
AC_CHECK_HEADER(tcpd.h,
LIBS="-lwrap $LIBS"
AC_MSG_CHECKING(for TCP wrappers library -lwrap)
@ -54,7 +54,7 @@ $OpenBSD: patch-configure_in,v 1.9 2004/07/18 11:38:23 espie Exp $
int allow_severity = 0;
int deny_severity = 0;
@@ -1056,6 +1023,11 @@ case $SYSTEM_TYPE in
@@ -1076,6 +1043,11 @@ case $SYSTEM_TYPE in
CXXFLAGS="$CXXFLAGS -Dunix"
OVERRIDE_MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
;;
@ -66,7 +66,7 @@ $OpenBSD: patch-configure_in,v 1.9 2004/07/18 11:38:23 espie Exp $
*bsdi*)
echo "Adding fix for BSDI"
CFLAGS="$CFLAGS -D__BSD__ -DHAVE_BROKEN_REALPATH"
@@ -1545,7 +1517,7 @@ then
@@ -1566,7 +1538,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
@ -75,7 +75,7 @@ $OpenBSD: patch-configure_in,v 1.9 2004/07/18 11:38:23 espie Exp $
esac
AC_CHECK_FUNCS(strtok_r pthread_init)
@@ -1572,29 +1544,6 @@ case $SYSTEM_TYPE in
@@ -1593,29 +1565,6 @@ case $SYSTEM_TYPE in
AC_SYS_RESTARTABLE_SYSCALLS
;;
esac

22
databases/mysql/patches/patch-include_my_global_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-include_my_global_h,v 1.2 2004/10/20 08:09:36 brad Exp $
--- include/my_global.h.orig Thu May 13 20:53:17 2004
+++ include/my_global.h Wed Oct 20 04:02:16 2004
$OpenBSD: patch-include_my_global_h,v 1.3 2005/01/14 01:42:58 brad Exp $
--- include/my_global.h.orig Wed Oct 27 20:48:34 2004
+++ include/my_global.h Wed Nov 3 21:41:05 2004
@@ -43,6 +43,10 @@
#define HAVE_ERRNO_AS_DEFINE
#endif /* __CYGWIN__ */
@ -12,19 +12,3 @@ $OpenBSD: patch-include_my_global_h,v 1.2 2004/10/20 08:09:36 brad Exp $
#if defined(i386) && !defined(__i386__)
#define __i386__
#endif
@@ -891,7 +895,14 @@ typedef char bool; /* Ordinary boolean
(((uint32) ((uchar) (A)[1])) << 8) +\
(((uint32) ((uchar) (A)[2])) << 16))
#else
-#define uint3korr(A) (long) (*((unsigned long *) (A)) & 0xFFFFFF)
+
+/*
+ ATTENTION !
+
+ Please, note, uint3korr reads 4 bytes (not 3) !
+ It means, that you have to provide enough allocated space !
+*/
+#define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF)
#endif
#define uint4korr(A) (*((unsigned long *) (A)))
#define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\

12
databases/mysql/patches/patch-include_my_sys_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-include_my_sys_h,v 1.1 2004/10/20 07:36:04 brad Exp $
--- include/my_sys.h.orig Thu May 13 20:53:30 2004
+++ include/my_sys.h Wed Oct 20 00:50:18 2004
@@ -620,7 +620,7 @@ extern my_string my_path(my_string to,co
const char *own_pathname_part);
extern my_string my_load_path(my_string to, const char *path,
const char *own_path_prefix);
-extern int wild_compare(const char *str,const char *wildstr);
+extern int wild_compare(const char *str,const char *wildstr,pbool str_is_pattern);
extern my_string my_strcasestr(const char *src,const char *suffix);
extern int my_strcasecmp(const char *s,const char *t);
extern int my_strsortcmp(const char *s,const char *t);

9
databases/mysql/patches/patch-innobase_Makefile_in
View File

@ -1,14 +1,13 @@
$OpenBSD: patch-innobase_Makefile_in,v 1.5 2004/05/21 12:16:21 brad Exp $
--- innobase/Makefile.in.orig 2004-05-13 20:54:33.000000000 -0400
+++ innobase/Makefile.in 2004-05-18 16:28:25.000000000 -0400
@@ -486,10 +486,10 @@ distcleancheck: distclean
$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
check-am: all-am
check: check-recursive
all-am: Makefile $(HEADERS) ib_config.h
-installdirs: installdirs-recursive
+installdirs:
installdirs-am:
-install: install-recursive
+install:
install-exec: install-exec-recursive

13
databases/mysql/patches/patch-libmysql_libmysql_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-libmysql_libmysql_c,v 1.3 2004/10/20 04:47:29 brad Exp $
--- libmysql/libmysql.c.orig Tue Oct 19 21:50:29 2004
+++ libmysql/libmysql.c Tue Oct 19 21:52:42 2004
@@ -1855,7 +1855,8 @@ mysql_real_connect(MYSQL *mysql,const ch
sprintf(net->last_error, ER(CR_UNKNOWN_HOST), host, tmp_errno);
goto error;
}
- memcpy(&sock_addr.sin_addr,hp->h_addr, (size_t) hp->h_length);
+ memcpy(&sock_addr.sin_addr, hp->h_addr,
+ min(sizeof(sock_addr.sin_addr), (size_t) hp->h_length));
my_gethostbyname_r_free();
}
sock_addr.sin_port = (ushort) htons((ushort) port);

39
databases/mysql/patches/patch-ltmain_sh Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2005/01/14 01:42:58 brad Exp $
--- ltmain.sh.orig Wed Jan 12 22:58:48 2005
+++ ltmain.sh Wed Jan 12 23:00:27 2005
@@ -1322,7 +1322,7 @@ EOF
;;
-shrext)
- prev=shrext
+ prev=shrext_cmds
continue
;;
@@ -2755,7 +2755,7 @@ EOF
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- eval shared_ext=\"$shrext\"
+ eval shared_ext=\"$shrext_cmds\"
eval libname=\"$libname_spec\"
;;
*)
@@ -2767,7 +2767,7 @@ EOF
if test "$need_lib_prefix" != no; then
# Add the "lib" prefix for modules if required
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
- eval shared_ext=\"$shrext\"
+ eval shared_ext=\"$shrext_cmds\"
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
@@ -3523,7 +3523,7 @@ EOF
fi
# Get the real and link names of the library.
- eval shared_ext=\"$shrext\"
+ eval shared_ext=\"$shrext_cmds\"
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"

12
databases/mysql/patches/patch-myisam_ft_boolean_search_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-myisam_ft_boolean_search_c,v 1.1 2004/10/20 04:47:29 brad Exp $
--- myisam/ft_boolean_search.c.orig Thu May 13 20:53:29 2004
+++ myisam/ft_boolean_search.c Tue Oct 19 22:15:59 2004
@@ -360,7 +360,7 @@ err:
}
-/* returns 1 if str0 ~= /\<str1\>/ */
+/* returns 1 if str0 ~= /\bstr1\b/ */
static int _ftb_strstr(const byte *s0, const byte *e0,
const byte *s1, const byte *e1,
CHARSET_INFO *cs)

63
databases/mysql/patches/patch-myisam_ft_parser_c
View File

@ -1,63 +0,0 @@
$OpenBSD: patch-myisam_ft_parser_c,v 1.1 2004/10/20 04:47:29 brad Exp $
--- myisam/ft_parser.c.orig Thu May 13 20:53:24 2004
+++ myisam/ft_parser.c Tue Oct 19 22:15:59 2004
@@ -124,28 +124,31 @@ byte ft_get_word(byte **start, byte *end
for (;doc<end;doc++)
{
if (true_word_char(*doc)) break;
- if (*doc == FTB_RQUOT && param->quot) {
+ if (*doc == FTB_RQUOT && param->quot)
+ {
param->quot=doc;
*start=doc+1;
return 3; /* FTB_RBR */
}
- if ((*doc == FTB_LBR || *doc == FTB_RBR || *doc == FTB_LQUOT)
- && !param->quot)
+ if (!param->quot)
{
- /* param->prev=' '; */
- *start=doc+1;
- if (*doc == FTB_LQUOT) param->quot=*start;
- return (*doc == FTB_RBR)+2;
+ if (*doc == FTB_LBR || *doc == FTB_RBR || *doc == FTB_LQUOT)
+ {
+ /* param->prev=' '; */
+ *start=doc+1;
+ if (*doc == FTB_LQUOT) param->quot=*start;
+ return (*doc == FTB_RBR)+2;
+ }
+ if (param->prev == ' ')
+ {
+ if (*doc == FTB_YES ) { param->yesno=+1; continue; } else
+ if (*doc == FTB_EGAL) { param->yesno= 0; continue; } else
+ if (*doc == FTB_NO ) { param->yesno=-1; continue; } else
+ if (*doc == FTB_INC ) { param->plusminus++; continue; } else
+ if (*doc == FTB_DEC ) { param->plusminus--; continue; } else
+ if (*doc == FTB_NEG ) { param->pmsign=!param->pmsign; continue; }
+ }
}
- if (param->prev == ' ' && !param->quot)
- {
- if (*doc == FTB_YES ) { param->yesno=+1; continue; } else
- if (*doc == FTB_EGAL) { param->yesno= 0; continue; } else
- if (*doc == FTB_NO ) { param->yesno=-1; continue; } else
- if (*doc == FTB_INC ) { param->plusminus++; continue; } else
- if (*doc == FTB_DEC ) { param->plusminus--; continue; } else
- if (*doc == FTB_NEG ) { param->pmsign=!param->pmsign; continue; }
- }
param->prev=*doc;
param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0);
param->plusminus=param->pmsign=0;
@@ -169,6 +172,11 @@ byte ft_get_word(byte **start, byte *end
*start=doc;
return 1;
}
+ }
+ if (param->quot)
+ {
+ param->quot=*start=doc;
+ return 3; /* FTB_RBR */
}
return 0;
}

10
databases/mysql/patches/patch-mysql-test_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.6 2004/02/22 01:20:11 brad Exp $
--- mysql-test/Makefile.in.orig 2004-02-10 13:16:51.000000000 -0500
+++ mysql-test/Makefile.in 2004-02-12 21:24:56.000000000 -0500
@@ -272,7 +272,7 @@ uname_prog = @uname_prog@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.7 2005/01/14 01:42:58 brad Exp $
--- mysql-test/Makefile.in.orig Sat Dec 18 12:25:33 2004
+++ mysql-test/Makefile.in Wed Dec 22 10:50:54 2004
@@ -290,7 +290,7 @@ tools_dirs = @tools_dirs@
uname_prog = @uname_prog@
vio_dir = @vio_dir@
vio_libs = @vio_libs@
-benchdir_root = $(prefix)
+benchdir_root = $(datadir)
testdir = $(benchdir_root)/mysql-test

8
databases/mysql/patches/patch-mysql-test_mysql-test-run_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mysql-test_mysql-test-run_sh,v 1.4 2004/05/21 12:16:21 brad Exp $
--- mysql-test/mysql-test-run.sh.orig 2004-05-13 20:53:22.000000000 -0400
+++ mysql-test/mysql-test-run.sh 2004-05-18 16:28:26.000000000 -0400
@@ -93,7 +93,6 @@ sleep_until_file_created ()
$OpenBSD: patch-mysql-test_mysql-test-run_sh,v 1.5 2005/01/14 01:42:58 brad Exp $
--- mysql-test/mysql-test-run.sh.orig Sat Dec 18 12:25:06 2004
+++ mysql-test/mysql-test-run.sh Wed Dec 22 10:45:13 2004
@@ -94,7 +94,6 @@ sleep_until_file_created ()
loop=`expr $loop - 1`
done
echo "ERROR: $file was not created in $org_time seconds; Aborting"

94
databases/mysql/patches/patch-mysys_mf_wcomp_c
View File

@ -1,94 +0,0 @@
$OpenBSD: patch-mysys_mf_wcomp_c,v 1.1 2004/10/20 07:36:04 brad Exp $
--- mysys/mf_wcomp.c.orig Thu May 13 20:53:18 2004
+++ mysys/mf_wcomp.c Wed Oct 20 00:50:18 2004
@@ -23,11 +23,12 @@
char wild_many='*';
char wild_one='?';
-char wild_prefix=0;
+char wild_prefix=0; /* QQ this can potentially cause a SIGSEGV */
-int wild_compare(register const char *str, register const char *wildstr)
+int wild_compare(register const char *str, register const char *wildstr,
+ pbool str_is_pattern)
{
- reg3 int flag;
+ char cmp;
DBUG_ENTER("wild_compare");
while (*wildstr)
@@ -35,33 +36,55 @@ int wild_compare(register const char *st
while (*wildstr && *wildstr != wild_many && *wildstr != wild_one)
{
if (*wildstr == wild_prefix && wildstr[1])
+ {
wildstr++;
- if (*wildstr++ != *str++) DBUG_RETURN(1);
+ if (str_is_pattern && *str++ != wild_prefix)
+ DBUG_RETURN(1);
+ }
+ if (*wildstr++ != *str++)
+ DBUG_RETURN(1);
}
- if (! *wildstr ) DBUG_RETURN (*str != 0);
+ if (! *wildstr )
+ DBUG_RETURN(*str != 0);
if (*wildstr++ == wild_one)
{
- if (! *str++) DBUG_RETURN (1); /* One char; skipp */
+ if (! *str || (str_is_pattern && *str == wild_many))
+ DBUG_RETURN(1); /* One char; skip */
+ if (*str++ == wild_prefix && str_is_pattern && *str)
+ str++;
}
else
{ /* Found '*' */
- if (!*wildstr) DBUG_RETURN(0); /* '*' as last char: OK */
- flag=(*wildstr != wild_many && *wildstr != wild_one);
- do
+ while (str_is_pattern && *str == wild_many)
+ str++;
+ for (; *wildstr == wild_many || *wildstr == wild_one; wildstr++)
+ if (*wildstr == wild_many)
+ {
+ while (str_is_pattern && *str == wild_many)
+ str++;
+ }
+ else
+ {
+ if (str_is_pattern && *str == wild_prefix && str[1])
+ str+=2;
+ else if (! *str++)
+ DBUG_RETURN (1);
+ }
+ if (!*wildstr)
+ DBUG_RETURN(0); /* '*' as last char: OK */
+ if ((cmp= *wildstr) == wild_prefix && wildstr[1] && !str_is_pattern)
+ cmp=wildstr[1];
+ for (;;str++)
{
- if (flag)
- {
- char cmp;
- if ((cmp= *wildstr) == wild_prefix && wildstr[1])
- cmp=wildstr[1];
- while (*str && *str != cmp)
- str++;
- if (!*str) DBUG_RETURN (1);
- }
- if (wild_compare(str,wildstr) == 0) DBUG_RETURN (0);
- } while (*str++ && wildstr[0] != wild_many);
- DBUG_RETURN(1);
+ while (*str && *str != cmp)
+ str++;
+ if (!*str)
+ DBUG_RETURN (1);
+ if (wild_compare(str,wildstr,str_is_pattern) == 0)
+ DBUG_RETURN (0);
+ }
+ /* We will never come here */
}
}
- DBUG_RETURN (*str != '\0');
+ DBUG_RETURN (*str != 0);
} /* wild_compare */

21
databases/mysql/patches/patch-mysys_mf_wfile_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-mysys_mf_wfile_c,v 1.1 2004/10/20 07:36:04 brad Exp $
--- mysys/mf_wfile.c.orig Thu May 13 20:53:35 2004
+++ mysys/mf_wfile.c Wed Oct 20 00:50:18 2004
@@ -106,7 +106,7 @@ int wf_test(register WF_PACK *wf_pack, r
not_pos=wf_pack->not_pos;
for (i=0 ; i < not_pos; i++)
- if (wild_compare(name,wf_pack->wild[i]) == 0)
+ if (wild_compare(name,wf_pack->wild[i],0) == 0)
goto found;
if (i)
DBUG_RETURN(1); /* No-match */
@@ -115,7 +115,7 @@ found:
/* Test that it isn't in not-list */
for (i=not_pos ; i < wf_pack->wilds; i++)
- if (wild_compare(name,wf_pack->wild[i]) == 0)
+ if (wild_compare(name,wf_pack->wild[i],0) == 0)
DBUG_RETURN(1);
DBUG_RETURN(0);
} /* wf_test */

8
databases/mysql/patches/patch-scripts_Makefile.in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_Makefile.in,v 1.14 2004/05/21 12:16:21 brad Exp $
--- scripts/Makefile.in.orig 2004-05-13 20:54:11.000000000 -0400
+++ scripts/Makefile.in 2004-05-18 16:28:26.000000000 -0400
@@ -554,6 +554,7 @@ mysqlbug: ${top_builddir}/config.status
$OpenBSD: patch-scripts_Makefile.in,v 1.15 2005/01/14 01:42:58 brad Exp $
--- scripts/Makefile.in.orig Sat Dec 18 12:25:36 2004
+++ scripts/Makefile.in Wed Dec 22 10:45:13 2004
@@ -580,6 +580,7 @@ mysqlbug: ${top_builddir}/config.status
-e 's!@''datadir''@!$(datadir)!g' \
-e 's!@''localstatedir''@!$(localstatedir)!g' \
-e 's!@''libexecdir''@!$(libexecdir)!g' \

77
databases/mysql/patches/patch-scripts_mysql_install_db.sh
View File

@ -1,35 +1,47 @@
$OpenBSD: patch-scripts_mysql_install_db.sh,v 1.16 2004/05/21 12:16:21 brad Exp $
--- scripts/mysql_install_db.sh.orig 2004-05-13 20:53:23.000000000 -0400
+++ scripts/mysql_install_db.sh 2004-05-19 11:14:59.000000000 -0400
@@ -7,12 +7,9 @@
$OpenBSD: patch-scripts_mysql_install_db.sh,v 1.17 2005/01/14 01:42:58 brad Exp $
--- scripts/mysql_install_db.sh.orig Mon Sep 6 18:29:38 2004
+++ scripts/mysql_install_db.sh Wed Sep 15 15:38:38 2004
@@ -7,16 +7,12 @@
#
# All unrecognized arguments to this script are passed to mysqld.
-IN_RPM=0
-case "$1" in
- -IN-RPM)
- IN_RPM="1"; shift
- ;;
-esac
-in_rpm=0
-windows=0
defaults=""
user=""
+user=_mysql
+group=_mysql
+
defaults=
case "$1" in
- -IN-RPM)
- in_rpm="1"; shift
- ;;
-esac
-case "$1" in
--no-defaults|--defaults-file=*|--defaults-extra-file=*)
@@ -33,10 +30,10 @@ parse_arguments() {
defaults="$1"; shift
;;
@@ -35,7 +31,6 @@ parse_arguments() {
for arg do
case "$arg" in
- --force) force=1 ;;
--basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--user=*)
@@ -43,10 +38,9 @@ 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 ;;
- --rpm) in_rpm=1 ;;
- --windows) windows=1 ;;
*)
if test -n "$pick_args"
@@ -70,7 +67,6 @@ ldata=
then
@@ -82,7 +76,6 @@ ldata=
execdir=
bindir=
basedir=
@ -37,20 +49,29 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.16 2004/05/21 12:16:21 brad Exp
parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
parse_arguments PICK-ARGS-FROM-ARGV "$@"
@@ -97,43 +93,33 @@ mdata=$ldata/mysql
@@ -111,52 +104,35 @@ mysqld=$execdir/mysqld
mysqld_opt=""
scriptdir=$bindir
if test ! -x $execdir/mysqld
-if test "$windows" = 1
-then
- mysqld="./sql/mysqld"
- mysqld_opt="--language=./sql/share/english"
- scriptdir="./scripts"
-fi
-
if test ! -x $mysqld
then
- if test "$IN_RPM" = "1"
- if test "$in_rpm" = 1
- then
- echo "FATAL ERROR $execdir/mysqld not found!"
- echo "FATAL ERROR $mysqld not found!"
- exit 1
- else
- echo "Didn't find $execdir/mysqld"
- echo "Didn't find $mysqld"
- echo "You should do a 'make install' before executing this script"
- exit 1
- fi
+ echo "FATAL ERROR $execdir/mysqld not found!"
+ echo "FATAL ERROR $mysqld not found!"
+ exit 1
fi
@ -58,7 +79,7 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.16 2004/05/21 12:16:21 brad Exp
hostname=`@HOSTNAME@`
# Check if hostname is valid
-if test "$IN_RPM" = "0" -a $force = "0"
-if test "$windows" = 0 -a "$in_rpm" = 0 -a $force = 0
+resolved=`$bindir/resolveip $hostname 2>&1`
+if [ $? -ne 0 ]
then
@ -69,7 +90,7 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.16 2004/05/21 12:16:21 brad Exp
- resolved=`$bindir/resolveip localhost 2>&1`
- if [ $? -ne 0 ]
- then
- echo "Neither host '$hostname' and 'localhost' could not be looked up with"
- echo "Neither host '$hostname' nor 'localhost' could not be looked up with"
- echo "$bindir/resolveip"
- echo "Please configure the 'hostname' command to return a correct hostname."
- echo "If you want to solve this at a later stage, restart this script with"
@ -82,7 +103,7 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.16 2004/05/21 12:16:21 brad Exp
- echo "normally with the exception that host name resolving will not work."
- echo "This means that you should use IP addresses instead of hostnames"
- echo "when specifying MySQL privileges !"
+ echo "Neither host '$hostname' and 'localhost' could not be looked up with"
+ echo "Neither host '$hostname' nor 'localhost' could not be looked up with"
+ echo "$bindir/resolveip"
+ echo "Please configure the 'hostname' command to return a correct hostname."
+ echo "If you want to solve this at a later stage, restart this script with"
@ -98,7 +119,7 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.16 2004/05/21 12:16:21 brad Exp
fi
if test "$ip_only" = "1"
@@ -143,12 +129,10 @@ then
@@ -166,12 +142,10 @@ then
fi
# Create database directories mysql & test
@ -115,11 +136,11 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.16 2004/05/21 12:16:21 brad Exp
# Initialize variables
c_d="" i_d=""
@@ -333,12 +317,6 @@ $c_c
@@ -361,12 +335,6 @@ $c_c
END_OF_DATA
then
echo ""
- if test "$IN_RPM" = "0"
- if test "$in_rpm" = "0"
- then
- echo "To start mysqld at boot time you have to copy support-files/mysql.server"
- echo "to the right place for your system"
@ -128,11 +149,11 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.16 2004/05/21 12:16:21 brad Exp
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
echo "To do so, start the server, then issue the following commands:"
echo "$bindir/mysqladmin -u root password 'new-password'"
@@ -354,15 +332,6 @@ then
@@ -382,15 +350,6 @@ then
echo "able to use the new GRANT command!"
fi
echo
- if test "$IN_RPM" = "0"
- if test "$in_rpm" = "0"
- then
- echo "You can start the MySQL daemon with:"
- echo "cd @prefix@ ; $bindir/mysqld_safe &"

46
databases/mysql/patches/patch-scripts_mysqld_safe_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.6 2004/05/24 22:40:28 brad Exp $
--- scripts/mysqld_safe.sh.orig 2004-05-13 20:53:19.000000000 -0400
+++ scripts/mysqld_safe.sh 2004-05-24 18:35:56.000000000 -0400
@@ -90,32 +90,12 @@ parse_arguments() {
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.7 2005/01/14 01:42:58 brad Exp $
--- scripts/mysqld_safe.sh.orig Sat Dec 18 12:25:05 2004
+++ scripts/mysqld_safe.sh Wed Dec 22 11:01:01 2004
@@ -84,32 +84,12 @@ parse_arguments() {
}
@ -39,7 +39,7 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.6 2004/05/24 22:40:28 brad Exp $
niceness=0
# Use the mysqld-max binary by default if the user doesn't specify a binary
@@ -155,6 +135,7 @@ fi
@@ -149,6 +129,7 @@ fi
parse_arguments `$print_defaults --loose-verbose $defaults mysqld_safe safe_mysqld`
parse_arguments PICK-ARGS-FROM-ARGV "$@"
safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}}
@ -47,7 +47,7 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.6 2004/05/24 22:40:28 brad Exp $
if test ! -x $ledir/$MYSQLD
then
@@ -299,11 +280,12 @@ fi
@@ -293,11 +274,12 @@ fi
echo "Starting $MYSQLD daemon with databases from $DATADIR"
@ -65,35 +65,37 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.6 2004/05/24 22:40:28 brad Exp $
echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log
while true
@@ -320,33 +302,6 @@ do
@@ -315,35 +297,6 @@ do
break
fi
- if test @IS_LINUX@ -a $KILL_MYSQLD -eq 1
- if @IS_LINUX@ && test $KILL_MYSQLD -eq 1
- then
- # Test if one process was hanging.
- # This is only a fix for Linux (running as base 3 mysqld processes)
- # but should work for the rest of the servers.
- # The only thing is ps x => redhat 5 gives warnings when using ps -x.
- # kill -9 is used or the process won't react on the kill.
- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
- numofproces=`ps xa | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
-
- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
- I=1
- while test "$I" -le "$numofproces"
- do
- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'`
- for T in $PROC
- do
- break
- done
- # echo "TEST $I - $T **"
- if kill -9 $T
- then
- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log
- else
- break
- fi
- I=`expr $I + 1`
- PROC=`ps xa | grep "$ledir/$MYSQLD\>" | grep -v "grep" | grep "pid-file=$pid_file" | sed -n '$p'`
-
- for T in $PROC
- do
- break
- done
- # echo "TEST $I - $T **"
- if kill -9 $T
- then
- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log
- else
- break
- fi
- I=`expr $I + 1`
- done
- fi
echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log

50
databases/mysql/patches/patch-scripts_mysqlhotcopy_sh
View File

@ -1,50 +0,0 @@
$OpenBSD: patch-scripts_mysqlhotcopy_sh,v 1.2 2004/10/20 01:54:05 brad Exp $
--- scripts/mysqlhotcopy.sh.orig Thu May 13 20:53:38 2004
+++ scripts/mysqlhotcopy.sh Tue Oct 19 21:46:12 2004
@@ -7,6 +7,7 @@ use File::Basename;
use File::Path;
use DBI;
use Sys::Hostname;
+use File::Temp;
=head1 NAME
@@ -610,7 +611,6 @@ sub copy_files {
sub copy_index
{
my ($method, $files, $source, $target) = @_;
- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$";
print "Copying indices for ".@$files." files...\n" unless $opt{quiet};
foreach my $file (@$files)
@@ -636,23 +636,23 @@ sub copy_index
}
close OUTPUT || die "Error on close of $to: $!\n";
}
- elsif ($opt{method} eq 'scp')
+ elsif ($opt{method} =~ /^scp\b/)
{
- my $tmp=$tmpfile;
- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n";
- if (syswrite(OUTPUT,$buff) != length($buff))
+ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir);
+ die "Can\'t create/open file in $opt_tmpdir\n" unless defined $fh;
+ if (syswrite($fh,$buff) != length($buff))
{
die "Error when writing data to $tmp: $!\n";
}
- close OUTPUT || die "Error on close of $tmp: $!\n";
- safe_system("scp $tmp $to");
+ close $fh || die "Error on close of $tmp: $!\n";
+ safe_system("$opt{method} $tmp $to");
+ unlink $tmp;
}
else
{
die "Can't use unsupported method '$opt{method}'\n";
}
}
- unlink "$tmpfile" if ($opt{method} eq 'scp');
}

15
databases/mysql/patches/patch-sql_records_cc
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-sql_records_cc,v 1.1 2004/10/20 08:09:36 brad Exp $
--- sql/records.cc.orig Wed Oct 20 04:00:01 2004
+++ sql/records.cc Wed Oct 20 04:00:44 2004
@@ -249,9 +249,10 @@ static int init_rr_cache(READ_RECORD *in
rec_cache_size=info->cache_records*info->reclength;
info->rec_cache_size=info->cache_records*info->ref_length;
+ // We have to allocate one more byte to use uint3korr (see comments for it)
if (info->cache_records <= 2 ||
!(info->cache=(byte*) my_malloc_lock(rec_cache_size+info->cache_records*
- info->struct_length,
+ info->struct_length+1,
MYF(0))))
DBUG_RETURN(1);
#ifdef HAVE_purify

48
databases/mysql/patches/patch-sql_sql_acl_cc
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-sql_sql_acl_cc,v 1.3 2004/10/20 07:36:04 brad Exp $
--- sql/sql_acl.cc.orig Thu May 13 20:53:35 2004
+++ sql/sql_acl.cc Wed Oct 20 00:50:19 2004
@@ -834,7 +834,7 @@ static void acl_insert_db(const char *us
*/
ulong acl_get(const char *host, const char *ip, const char *bin_ip,
- const char *user, const char *db)
+ const char *user, const char *db, my_bool db_is_pattern)
{
ulong host_access,db_access;
uint i,key_length;
@@ -868,7 +868,7 @@ ulong acl_get(const char *host, const ch
{
if (compare_hostname(&acl_db->host,host,ip))
{
- if (!acl_db->db || !wild_compare(db,acl_db->db))
+ if (!acl_db->db || !wild_compare(db,acl_db->db,db_is_pattern))
{
db_access=acl_db->access;
if (acl_db->host.hostname)
@@ -890,7 +890,7 @@ ulong acl_get(const char *host, const ch
ACL_HOST *acl_host=dynamic_element(&acl_hosts,i,ACL_HOST*);
if (compare_hostname(&acl_host->host,host,ip))
{
- if (!acl_host->db || !wild_compare(db,acl_host->db))
+ if (!acl_host->db || !wild_compare(db,acl_host->db,0))
{
host_access=acl_host->access; // Fully specified. Take it
break;
@@ -1222,7 +1222,7 @@ static bool compare_hostname(const acl_h
}
return (!host->hostname ||
(hostname && !wild_case_compare(hostname,host->hostname)) ||
- (ip && !wild_compare(ip,host->hostname)));
+ (ip && !wild_compare(ip,host->hostname,0)));
}
@@ -1300,7 +1300,7 @@ static bool test_if_create_new_users(THD
tl.db= (char*) "mysql";
tl.real_name= (char*) "user";
db_access=acl_get(thd->host, thd->ip, (char*) &thd->remote.sin_addr,
- thd->priv_user, tl.db);
+ thd->priv_user, tl.db, 0);
if (!(db_access & INSERT_ACL))
{
if (check_grant(thd,INSERT_ACL,&tl,0,1))

12
databases/mysql/patches/patch-sql_sql_acl_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sql_sql_acl_h,v 1.1 2004/10/20 07:36:04 brad Exp $
--- sql/sql_acl.h.orig Thu May 13 20:53:22 2004
+++ sql/sql_acl.h Wed Oct 20 00:50:19 2004
@@ -85,7 +85,7 @@ my_bool acl_init(THD *thd, bool dont_re
void acl_reload(THD *thd);
void acl_free(bool end=0);
ulong acl_get(const char *host, const char *ip, const char *bin_ip,
- const char *user, const char *db);
+ const char *user, const char *db, my_bool db_is_pattern);
ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user,
const char *password,const char *scramble,
char **priv_user, char *priv_host,

12
databases/mysql/patches/patch-sql_sql_base_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sql_sql_base_cc,v 1.1 2004/10/20 07:36:04 brad Exp $
--- sql/sql_base.cc.orig Thu May 13 20:53:18 2004
+++ sql/sql_base.cc Wed Oct 20 00:50:19 2004
@@ -149,7 +149,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *t
if (wild)
{
strxmov(name,entry->table_cache_key,".",entry->real_name,NullS);
- if (wild_compare(name,wild))
+ if (wild_compare(name,wild,0))
continue;
}

12
databases/mysql/patches/patch-sql_sql_db_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sql_sql_db_cc,v 1.1 2004/10/20 07:36:04 brad Exp $
--- sql/sql_db.cc.orig Thu May 13 20:53:31 2004
+++ sql/sql_db.cc Wed Oct 20 00:50:19 2004
@@ -408,7 +408,7 @@ bool mysql_change_db(THD *thd,const char
db_access=DB_ACLS;
else
db_access= (acl_get(thd->host,thd->ip,(char*) &thd->remote.sin_addr,
- thd->priv_user,dbname) |
+ thd->priv_user,dbname,0) |
thd->master_access);
if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
{

33
databases/mysql/patches/patch-sql_sql_parse_cc
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-sql_sql_parse_cc,v 1.2 2004/10/20 07:36:04 brad Exp $
--- sql/sql_parse.cc.orig Thu May 13 20:53:18 2004
+++ sql/sql_parse.cc Wed Oct 20 00:50:19 2004
@@ -2670,7 +2670,7 @@ check_access(THD *thd, ulong want_access
if (!(thd->master_access & SELECT_ACL) &&
(db && (!thd->db || strcmp(db,thd->db))))
db_access=acl_get(thd->host, thd->ip, (char*) &thd->remote.sin_addr,
- thd->priv_user, db); /* purecov: inspected */
+ thd->priv_user, db, 0); /* purecov: inspected */
*save_priv=thd->master_access | db_access;
DBUG_RETURN(FALSE);
}
@@ -2690,7 +2690,7 @@ check_access(THD *thd, ulong want_access
if (db && (!thd->db || strcmp(db,thd->db)))
db_access=acl_get(thd->host, thd->ip, (char*) &thd->remote.sin_addr,
- thd->priv_user, db); /* purecov: inspected */
+ thd->priv_user, db, 0); /* purecov: inspected */
else
db_access=thd->db_access;
// Remove SHOW attribute and access rights we already have
@@ -3155,7 +3155,10 @@ bool add_field_to_list(char *field_name,
break;
case FIELD_TYPE_DECIMAL:
if (!length)
- new_field->length= 10; // Default length for DECIMAL
+ if (new_field->length= new_field->decimals)
+ new_field->length++;
+ else
+ new_field->length=10; // Default length for DECIMAL
if (new_field->length < MAX_FIELD_WIDTH) // Skip wrong argument
{
new_field->length+=sign_len;

30
databases/mysql/patches/patch-sql_sql_show_cc
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-sql_sql_show_cc,v 1.1 2004/10/20 07:36:04 brad Exp $
--- sql/sql_show.cc.orig Thu May 13 20:53:23 2004
+++ sql/sql_show.cc Wed Oct 20 00:50:19 2004
@@ -78,7 +78,7 @@ mysqld_show_dbs(THD *thd,const char *wil
{
if (thd->master_access & (DB_ACLS | SHOW_DB_ACL) ||
acl_get(thd->host, thd->ip, (char*) &thd->remote.sin_addr,
- thd->priv_user, file_name) ||
+ thd->priv_user, file_name, 0) ||
(grant_option && !check_grant_db(thd, file_name)))
{
thd->packet.length(0);
@@ -214,7 +214,7 @@ mysql_find_files(THD *thd,List<char> *fi
#endif
{
if (file->name[0] == '.' || !MY_S_ISDIR(file->mystat->st_mode) ||
- (wild && wild_compare(file->name,wild)))
+ (wild && wild_compare(file->name,wild, 0)))
continue;
}
}
@@ -232,7 +232,7 @@ mysql_find_files(THD *thd,List<char> *fi
if (wild_case_compare(file->name,wild))
continue;
}
- else if (wild_compare(file->name,wild))
+ else if (wild_compare(file->name,wild, 0))
continue;
}
}

3
databases/mysql/pkg/PLIST-server
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.14 2004/10/12 21:14:42 espie Exp $
@comment $OpenBSD: PLIST-server,v 1.15 2005/01/14 01:42:58 brad Exp $
@newgroup _mysql:502
@newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
bin/comp_err
@ -181,6 +181,7 @@ share/mysql/korean/errmsg.txt
share/mysql/mi_test_all
share/mysql/mi_test_all.res
share/mysql/my-huge.cnf
share/mysql/my-innodb-heavy-4G.cnf
share/mysql/my-large.cnf
share/mysql/my-medium.cnf
share/mysql/my-small.cnf

26
databases/mysql/pkg/PLIST-tests
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.10 2004/08/10 00:52:43 espie Exp $
@comment $OpenBSD: PLIST-tests,v 1.11 2005/01/14 01:42:58 brad Exp $
share/mysql-test/
share/mysql-test/README
share/mysql-test/include/
@ -45,6 +45,7 @@ share/mysql-test/r/convert.result
share/mysql-test/r/count_distinct.result
share/mysql-test/r/count_distinct2.result
share/mysql-test/r/create.result
share/mysql-test/r/create_select_tmp.result
share/mysql-test/r/ctype_cp1251.result
share/mysql-test/r/ctype_latin1_de.result
share/mysql-test/r/ctype_tis620.result
@ -59,6 +60,8 @@ share/mysql-test/r/empty_table.result
share/mysql-test/r/errors.result
share/mysql-test/r/explain.result
share/mysql-test/r/flush.result
share/mysql-test/r/flush_block_commit.result
share/mysql-test/r/flush_table.result
share/mysql-test/r/foreign_key.result
share/mysql-test/r/fulltext.result
share/mysql-test/r/fulltext_cache.result
@ -98,6 +101,7 @@ share/mysql-test/r/have_crypt.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_openssl.require
share/mysql-test/r/have_openssl_1.require
share/mysql-test/r/have_query_cache.require
@ -181,11 +185,14 @@ share/mysql-test/r/rpl_EE_error.result
share/mysql-test/r/rpl_alter.result
share/mysql-test/r/rpl_chain_temp_table.result
share/mysql-test/r/rpl_change_master.result
share/mysql-test/r/rpl_commit_after_flush.result
share/mysql-test/r/rpl_do_grant.result
share/mysql-test/r/rpl_drop.result
share/mysql-test/r/rpl_empty_master_crash.result
share/mysql-test/r/rpl_error_ignored_table.result
share/mysql-test/r/rpl_failsafe.result
share/mysql-test/r/rpl_flush_log_loop.result
share/mysql-test/r/rpl_free_items.result
share/mysql-test/r/rpl_get_lock.result
share/mysql-test/r/rpl_heap.result
share/mysql-test/r/rpl_ignore_grant.result
@ -210,8 +217,10 @@ share/mysql-test/r/rpl_reset_slave.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_set_charset.result
share/mysql-test/r/rpl_skip_error.result
share/mysql-test/r/rpl_sporadic_master.result
share/mysql-test/r/rpl_start_stop_slave.result
share/mysql-test/r/rpl_trunc_binlog.result
share/mysql-test/r/sel000001.result
share/mysql-test/r/sel000002.result
@ -233,6 +242,7 @@ 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/timezone.result
share/mysql-test/r/timezone3.result
share/mysql-test/r/true.require
share/mysql-test/r/truncate.result
share/mysql-test/r/type_blob.result
@ -254,14 +264,17 @@ share/mysql-test/r/varbinary.result
share/mysql-test/r/variables.result
share/mysql-test/r/warnings.result
share/mysql-test/std_data/
share/mysql-test/std_data/Moscow_leap
share/mysql-test/std_data/des_key_file
share/mysql-test/std_data/init_file.dat
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/master-bin.001
share/mysql-test/std_data/rpl_loaddata.dat
share/mysql-test/std_data/rpl_loaddata2.dat
share/mysql-test/std_data/trunc_binlog.001
share/mysql-test/std_data/words.dat
share/mysql-test/t/
share/mysql-test/t/alias.test
@ -296,6 +309,7 @@ share/mysql-test/t/count_distinct.test
share/mysql-test/t/count_distinct2-master.opt
share/mysql-test/t/count_distinct2.test
share/mysql-test/t/create.test
share/mysql-test/t/create_select_tmp.test
share/mysql-test/t/ctype_cp1251-master.opt
share/mysql-test/t/ctype_cp1251.test
share/mysql-test/t/ctype_latin1_de-master.opt
@ -314,6 +328,7 @@ share/mysql-test/t/empty_table.test
share/mysql-test/t/errors.test
share/mysql-test/t/explain.test
share/mysql-test/t/flush.test
share/mysql-test/t/flush_block_commit.test
share/mysql-test/t/flush_table.test
share/mysql-test/t/foreign_key.test
share/mysql-test/t/fulltext.test
@ -384,6 +399,7 @@ share/mysql-test/t/lowercase_table2.test
share/mysql-test/t/lowercase_table3-master.opt
share/mysql-test/t/lowercase_table3.test
share/mysql-test/t/merge.test
share/mysql-test/t/mix_innodb_myisam_binlog-master.opt
share/mysql-test/t/mix_innodb_myisam_binlog.test
share/mysql-test/t/multi_update-master.opt
share/mysql-test/t/multi_update.test
@ -444,7 +460,9 @@ share/mysql-test/t/rpl_EE_error.test
share/mysql-test/t/rpl_alter.test
share/mysql-test/t/rpl_chain_temp_table.test
share/mysql-test/t/rpl_change_master.test
share/mysql-test/t/rpl_commit_after_flush.test
share/mysql-test/t/rpl_do_grant.test
share/mysql-test/t/rpl_drop.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
@ -454,6 +472,8 @@ share/mysql-test/t/rpl_flush_log_loop-master.sh
share/mysql-test/t/rpl_flush_log_loop-slave.opt
share/mysql-test/t/rpl_flush_log_loop-slave.sh
share/mysql-test/t/rpl_flush_log_loop.test
share/mysql-test/t/rpl_free_items-slave.opt
share/mysql-test/t/rpl_free_items.test
share/mysql-test/t/rpl_get_lock.test
share/mysql-test/t/rpl_heap.test
share/mysql-test/t/rpl_ignore_grant-slave.opt
@ -491,10 +511,12 @@ 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_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_sporadic_master-master.opt
share/mysql-test/t/rpl_sporadic_master.test
share/mysql-test/t/rpl_start_stop_slave.test
share/mysql-test/t/rpl_trunc_binlog.test
share/mysql-test/t/sel000001.test
share/mysql-test/t/sel000002.test
@ -517,6 +539,8 @@ share/mysql-test/t/tablelock.test
share/mysql-test/t/temp_table.test
share/mysql-test/t/timezone-master.opt
share/mysql-test/t/timezone.test
share/mysql-test/t/timezone3-master.opt
share/mysql-test/t/timezone3.test
share/mysql-test/t/truncate.test
share/mysql-test/t/type_blob.test
share/mysql-test/t/type_date.test