Thu Nov 26 16:33:30 2009 UTC ()
Update "mysql5-client" and "mysql5-server" package to version 5.0.88.
This release fixes a large number of bugs and security vulnerabilities
including SA37372.

For detailed list of all the changes since 5.0.67 have a look here, please:
http://dev.mysql.com/doc/refman/5.0/en/news-5-0-x.html


(tron)
diff -r1.21 -r1.22 pkgsrc/databases/mysql5-client/Makefile
diff -r1.35 -r1.36 pkgsrc/databases/mysql5-client/Makefile.common
diff -r1.11 -r1.12 pkgsrc/databases/mysql5-client/PLIST
diff -r1.26 -r1.27 pkgsrc/databases/mysql5-client/distinfo
diff -r1.3 -r0 pkgsrc/databases/mysql5-client/patches/patch-bh
diff -r1.1 -r0 pkgsrc/databases/mysql5-client/patches/patch-bi
diff -r1.1 -r0 pkgsrc/databases/mysql5-client/patches/patch-bj
diff -r1.28 -r1.29 pkgsrc/databases/mysql5-server/Makefile
diff -r1.14 -r1.15 pkgsrc/databases/mysql5-server/PLIST
diff -r1.22 -r1.23 pkgsrc/databases/mysql5-server/distinfo
diff -r1.5 -r1.6 pkgsrc/databases/mysql5-server/patches/patch-ab
diff -r1.5 -r1.6 pkgsrc/databases/mysql5-server/patches/patch-an
diff -r1.8 -r0 pkgsrc/databases/mysql5-server/patches/patch-ac
diff -r1.4 -r0 pkgsrc/databases/mysql5-server/patches/patch-ad
diff -r1.3 -r1.4 pkgsrc/databases/mysql5-server/patches/patch-al
cvs diff -r1.21 -r1.22 pkgsrc/databases/mysql5-client/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-client/Attic/Makefile 2009/05/20 00:58:10 1.21
+++ pkgsrc/databases/mysql5-client/Attic/Makefile 2009/11/26 16:33:29 1.22
@@ -1,41 +1,43 @@ @@ -1,41 +1,43 @@
1# $NetBSD: Makefile,v 1.21 2009/05/20 00:58:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2009/11/26 16:33:29 tron Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 3 
5SVR4_PKGNAME= mysqc 4SVR4_PKGNAME= mysqc
6COMMENT= MySQL 5, a free SQL database (client) 5COMMENT= MySQL 5, a free SQL database (client)
7 6
8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} 7CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
9 8
10PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
11 10
12.include "Makefile.common" 11.include "Makefile.common"
13 12
14CONFIGURE_ARGS+= --without-extra-tools 13CONFIGURE_ARGS+= --without-extra-tools
15CONFIGURE_ARGS+= --without-server 14CONFIGURE_ARGS+= --without-server
16CONFIGURE_ARGS+= --enable-thread-safe-client 15CONFIGURE_ARGS+= --enable-thread-safe-client
17UNWRAP_FILES+= scripts/mysql_config 16UNWRAP_FILES+= scripts/mysql_config
18INFO_FILES= yes 17INFO_FILES= yes
19 18
20AUTO_MKDIRS= yes 19AUTO_MKDIRS= yes
21 20
22REPLACE_PERL= scripts/mysql_convert_table_format.sh \ 21REPLACE_PERL= scripts/mysql_convert_table_format.sh \
23 scripts/mysql_explain_log.sh \ 22 scripts/mysql_explain_log.sh \
 23 scripts/mysql_find_rows.sh \
 24 scripts/mysql_fix_extensions.sh \
 25 scripts/mysql_setpermission.sh \
24 scripts/mysql_tableinfo.sh \ 26 scripts/mysql_tableinfo.sh \
 27 scripts/mysql_zap.sh \
 28 scripts/mysqlaccess.sh \
25 scripts/mysqldumpslow.sh \ 29 scripts/mysqldumpslow.sh \
26 scripts/mysqlhotcopy.sh 30 scripts/mysqlhotcopy.sh
27 31
28post-install: 32post-install:
29 cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do \ 33 cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do \
30 ${TEST} ! -f "$$f" || \ 34 ${TEST} ! -f "$$f" || \
31 ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\ 35 ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
32 done 36 done
33.for f in huge large innodb-heavy-4G small medium 37.for f in huge large innodb-heavy-4G small medium
34 ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \ 38 ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
35 ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf 39 ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
36.endfor 40.endfor
37 ${INSTALL_DATA} ${WRKSRC}/Docs/manual.chm \ 
38 ${DESTDIR}${PREFIX}/share/doc/mysql/ 
39 41
40.include "../../devel/readline/buildlink3.mk" 42.include "../../devel/readline/buildlink3.mk"
41.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/databases/mysql5-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-client/Attic/Makefile.common 2009/07/19 13:14:21 1.35
+++ pkgsrc/databases/mysql5-client/Attic/Makefile.common 2009/11/26 16:33:29 1.36
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.35 2009/07/19 13:14:21 tron Exp $ 1# $NetBSD: Makefile.common,v 1.36 2009/11/26 16:33:29 tron Exp $
2# 2#
3# used by databases/mysql5-client/Makefile 3# used by databases/mysql5-client/Makefile
4# used by databases/mysql5-server/Makefile 4# used by databases/mysql5-server/Makefile
5# 5#
6 6
7DISTNAME= mysql-5.0.67 7DISTNAME= mysql-5.0.88
8CATEGORIES= databases 8CATEGORIES= databases
9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/} 9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/}
10 10
11MAINTAINER= sketch@NetBSD.org 11MAINTAINER= sketch@NetBSD.org
12HOMEPAGE= http://www.mysql.com/ 12HOMEPAGE= http://www.mysql.com/
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19.include "options.mk" 19.include "options.mk"
20 20
@@ -30,26 +30,27 @@ MYSQL_DATADIR?= ${VARBASE}/mysql @@ -30,26 +30,27 @@ MYSQL_DATADIR?= ${VARBASE}/mysql
30 30
31PKG_USERS_VARS+= MYSQL_USER 31PKG_USERS_VARS+= MYSQL_USER
32PKG_GROUPS_VARS+= MYSQL_GROUP 32PKG_GROUPS_VARS+= MYSQL_GROUP
33 33
34# MYSQL_CHARSET default character set 34# MYSQL_CHARSET default character set
35# MYSQL_EXTRA_CHARSET additional character set to be compiled in. 35# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
36# 36#
37MYSQL_CHARSET?= latin1 37MYSQL_CHARSET?= latin1
38MYSQL_EXTRA_CHARSET?= all 38MYSQL_EXTRA_CHARSET?= all
39 39
40CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} 40CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q}
41CONFIGURE_ARGS+= --with-named-z-libs=z 41CONFIGURE_ARGS+= --with-named-z-libs=z
42CONFIGURE_ARGS+= --without-libwrap 42CONFIGURE_ARGS+= --without-libwrap
 43CONFIG_SHELL= ${TOOLS_PATH.bash}
43 44
44.if ${OPSYS} == "IRIX" 45.if ${OPSYS} == "IRIX"
45CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H 46CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
46# libgen is incorrectly detected 47# libgen is incorrectly detected
47CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no" 48CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no"
48.endif 49.endif
49 50
50BUILD_DEFS+= VARBASE 51BUILD_DEFS+= VARBASE
51 52
52# We always use our own readline. Note that these --without-* settings 53# We always use our own readline. Note that these --without-* settings
53# are confusing, but they just mean "don't use the included readline 54# are confusing, but they just mean "don't use the included readline
54# or libedit". 55# or libedit".
55# 56#
@@ -88,27 +89,27 @@ CFLAGS+= -DHAVE_CURSES_H @@ -88,27 +89,27 @@ CFLAGS+= -DHAVE_CURSES_H
88CXXFLAGS+= -DHAVE_CURSES_H 89CXXFLAGS+= -DHAVE_CURSES_H
89.endif 90.endif
90 91
91.include "../../mk/pthread.buildlink3.mk" 92.include "../../mk/pthread.buildlink3.mk"
92 93
93.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 94.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
94CFLAGS+= -DSIGNALS_DONT_BREAK_READ 95CFLAGS+= -DSIGNALS_DONT_BREAK_READ
95CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 96CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
96CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no 97CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no
97CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no 98CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
98.endif 99.endif
99 100
100USE_LANGUAGES= c c++ 101USE_LANGUAGES= c c++
101USE_TOOLS+= autoconf autoheader gmake perl:run 102USE_TOOLS+= autoconf bash autoheader gmake perl:run
102LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 103LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
103 104
104SUBST_CLASSES= mk 105SUBST_CLASSES= mk
105SUBST_STAGE.mk= post-patch 106SUBST_STAGE.mk= post-patch
106SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \ 107SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \
107 mysys/Makefile.in strings/Makefile.in 108 mysys/Makefile.in strings/Makefile.in
108SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//" 109SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//"
109SUBST_MESSAGE.mk= Fixing Makefiles. 110SUBST_MESSAGE.mk= Fixing Makefiles.
110 111
111SUBST_CLASSES+= scr 112SUBST_CLASSES+= scr
112SUBST_STAGE.scr= post-patch 113SUBST_STAGE.scr= post-patch
113SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 114SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
114 scripts/mysql_secure_installation.sh \ 115 scripts/mysql_secure_installation.sh \
cvs diff -r1.11 -r1.12 pkgsrc/databases/mysql5-client/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-client/Attic/PLIST 2009/06/14 17:43:19 1.11
+++ pkgsrc/databases/mysql5-client/Attic/PLIST 2009/11/26 16:33:29 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:43:19 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.12 2009/11/26 16:33:29 tron Exp $
2bin/msql2mysql 2bin/msql2mysql
3bin/mysql 3bin/mysql
4bin/mysql_config 4bin/mysql_config
5bin/mysql_convert_table_format 5bin/mysql_convert_table_format
6bin/mysql_explain_log 6bin/mysql_explain_log
7bin/mysql_find_rows 7bin/mysql_find_rows
8bin/mysql_fix_extensions 8bin/mysql_fix_extensions
9bin/mysql_fix_privilege_tables 9bin/mysql_fix_privilege_tables
10bin/mysql_setpermission 10bin/mysql_setpermission
11bin/mysql_tableinfo 11bin/mysql_tableinfo
12bin/mysql_upgrade 12bin/mysql_upgrade
13bin/mysql_upgrade_shell 13bin/mysql_upgrade_shell
14bin/mysql_zap 14bin/mysql_zap
@@ -57,24 +57,23 @@ include/mysql/sslopt-case.h @@ -57,24 +57,23 @@ include/mysql/sslopt-case.h
57include/mysql/sslopt-longopts.h 57include/mysql/sslopt-longopts.h
58include/mysql/sslopt-vars.h 58include/mysql/sslopt-vars.h
59include/mysql/typelib.h 59include/mysql/typelib.h
60info/mysql.info 60info/mysql.info
61lib/mysql/libmysqlclient.la 61lib/mysql/libmysqlclient.la
62lib/mysql/libmysqlclient_r.la 62lib/mysql/libmysqlclient_r.la
63man/man1/mysql.1 63man/man1/mysql.1
64man/man1/mysql_fix_privilege_tables.1 64man/man1/mysql_fix_privilege_tables.1
65man/man1/mysql_zap.1 65man/man1/mysql_zap.1
66man/man1/mysqlaccess.1 66man/man1/mysqlaccess.1
67man/man1/mysqladmin.1 67man/man1/mysqladmin.1
68man/man1/mysqldump.1 68man/man1/mysqldump.1
69man/man1/mysqlshow.1 69man/man1/mysqlshow.1
70share/doc/mysql/manual.chm 
71share/examples/mysql/my-huge.cnf 70share/examples/mysql/my-huge.cnf
72share/examples/mysql/my-innodb-heavy-4G.cnf 71share/examples/mysql/my-innodb-heavy-4G.cnf
73share/examples/mysql/my-large.cnf 72share/examples/mysql/my-large.cnf
74share/examples/mysql/my-medium.cnf 73share/examples/mysql/my-medium.cnf
75share/examples/mysql/my-small.cnf 74share/examples/mysql/my-small.cnf
76share/mysql/fill_help_tables.sql 75share/mysql/fill_help_tables.sql
77share/mysql/mysql_fix_privilege_tables.sql 76share/mysql/mysql_fix_privilege_tables.sql
78share/mysql/mysql_system_tables.sql 77share/mysql/mysql_system_tables.sql
79share/mysql/mysql_system_tables_data.sql 78share/mysql/mysql_system_tables_data.sql
80share/mysql/mysql_test_data_timezone.sql 79share/mysql/mysql_test_data_timezone.sql
cvs diff -r1.26 -r1.27 pkgsrc/databases/mysql5-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-client/Attic/distinfo 2009/01/28 10:30:53 1.26
+++ pkgsrc/databases/mysql5-client/Attic/distinfo 2009/11/26 16:33:29 1.27
@@ -1,28 +1,25 @@ @@ -1,28 +1,25 @@
1$NetBSD: distinfo,v 1.26 2009/01/28 10:30:53 he Exp $ 1$NetBSD: distinfo,v 1.27 2009/11/26 16:33:29 tron Exp $
2 2
3SHA1 (mysql-5.0.67.tar.gz) = 168090a4698a3a5efa2f2c9380a4352d4433d377 3SHA1 (mysql-5.0.88.tar.gz) = 2dc7a462eaca1452eefd334888a6c40022deb352
4RMD160 (mysql-5.0.67.tar.gz) = 05d38a5f8d91cb4dac1ee446af96b28163bd3722 4RMD160 (mysql-5.0.88.tar.gz) = a3ba4bd04e573b4a0bab073f36eec3ff44348ae6
5Size (mysql-5.0.67.tar.gz) = 28370810 bytes 5Size (mysql-5.0.88.tar.gz) = 22932765 bytes
6SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec 6SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
7SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7 7SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
8SHA1 (patch-ac) = 7e7034f64f8337e459fe16611db8d7854c02931e 8SHA1 (patch-ac) = 7e7034f64f8337e459fe16611db8d7854c02931e
9SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217 9SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217
10SHA1 (patch-ae) = 74c830dddf3517ebc2226dc166b61a33f83b04da 10SHA1 (patch-ae) = 74c830dddf3517ebc2226dc166b61a33f83b04da
11SHA1 (patch-af) = b36307e554df858412c52ae53753c62d9761aaad 11SHA1 (patch-af) = b36307e554df858412c52ae53753c62d9761aaad
12SHA1 (patch-ag) = 076ab47225b66bc6d8472ec48f808641afdb780d 12SHA1 (patch-ag) = 076ab47225b66bc6d8472ec48f808641afdb780d
13SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7 13SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7
14SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76 14SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76
15SHA1 (patch-aj) = 1b831b1c7a616eba7d27f362a7c885ce6b853bbb 15SHA1 (patch-aj) = 1b831b1c7a616eba7d27f362a7c885ce6b853bbb
16SHA1 (patch-al) = b77d3ebb9602a33e11d22190f26ea93fd6fb533d 16SHA1 (patch-al) = b77d3ebb9602a33e11d22190f26ea93fd6fb533d
17SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e 17SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e
18SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc 18SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc
19SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88 19SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88
20SHA1 (patch-ap) = fc4246e829a3b53b27ff2c6f5572eb4b13a277e5 20SHA1 (patch-ap) = fc4246e829a3b53b27ff2c6f5572eb4b13a277e5
21SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3 21SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3
22SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923 22SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923
23SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d 23SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
24SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156 24SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156
25SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299 25SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
26SHA1 (patch-bh) = 83f6f7f29636265e987fb00897a55290e2434643 
27SHA1 (patch-bi) = 5d0132f4e053abfc6210cd2dc425186765acaad3 
28SHA1 (patch-bj) = 1e00fab7db2f5ea04802053d41dedd2a356ea9ed 
File Deleted: pkgsrc/databases/mysql5-client/patches/Attic/patch-bh
File Deleted: pkgsrc/databases/mysql5-client/patches/Attic/patch-bi
File Deleted: pkgsrc/databases/mysql5-client/patches/Attic/patch-bj
cvs diff -r1.28 -r1.29 pkgsrc/databases/mysql5-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-server/Attic/Makefile 2009/07/19 13:50:20 1.28
+++ pkgsrc/databases/mysql5-server/Attic/Makefile 2009/11/26 16:33:29 1.29
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.28 2009/07/19 13:50:20 tron Exp $ 1# $NetBSD: Makefile,v 1.29 2009/11/26 16:33:29 tron Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 3 
5SVR4_PKGNAME= mysqs 4SVR4_PKGNAME= mysqs
6COMMENT= MySQL 5, a free SQL database (server) 5COMMENT= MySQL 5, a free SQL database (server)
7 6
8CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} 7CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
9 8
10PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
11 10
12.include "../../databases/mysql5-client/Makefile.common" 11.include "../../databases/mysql5-client/Makefile.common"
13 12
14MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
15 14
16CONFIGURE_ARGS+= --with-libwrap 15CONFIGURE_ARGS+= --with-libwrap
17CONFIGURE_ARGS+= --with-raid 16CONFIGURE_ARGS+= --with-raid
cvs diff -r1.14 -r1.15 pkgsrc/databases/mysql5-server/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-server/Attic/PLIST 2009/06/14 17:43:19 1.14
+++ pkgsrc/databases/mysql5-server/Attic/PLIST 2009/11/26 16:33:29 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:43:19 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.15 2009/11/26 16:33:29 tron Exp $
2bin/comp_err 2bin/comp_err
3bin/innochecksum 3bin/innochecksum
4bin/my_print_defaults 4bin/my_print_defaults
5bin/myisam_ftdump 5bin/myisam_ftdump
6bin/myisamchk 6bin/myisamchk
7bin/myisamlog 7bin/myisamlog
8bin/myisampack 8bin/myisampack
9bin/mysql.server 9bin/mysql.server
10bin/mysql_client_test 10bin/mysql_client_test
11bin/mysql_install_db 11bin/mysql_install_db
12bin/mysql_secure_installation 12bin/mysql_secure_installation
13bin/mysql_tzinfo_to_sql 13bin/mysql_tzinfo_to_sql
14bin/mysql_waitpid 14bin/mysql_waitpid
@@ -26,116 +26,135 @@ lib/mysql/libmysys.a @@ -26,116 +26,135 @@ lib/mysql/libmysys.a
26lib/mysql/libvio.a 26lib/mysql/libvio.a
27libexec/mysqld 27libexec/mysqld
28man/man1/mysqld_multi.1 28man/man1/mysqld_multi.1
29man/man8/mysqld.8 29man/man8/mysqld.8
30man/man8/mysqlmanager.8 30man/man8/mysqlmanager.8
31share/examples/rc.d/mysqld 31share/examples/rc.d/mysqld
32share/mysql-test/README 32share/mysql-test/README
33share/mysql-test/include/add_anonymous_users.inc 33share/mysql-test/include/add_anonymous_users.inc
34share/mysql-test/include/analyze_failure_sync_with_master.test 34share/mysql-test/include/analyze_failure_sync_with_master.test
35share/mysql-test/include/big_test.inc 35share/mysql-test/include/big_test.inc
36share/mysql-test/include/check-testcase.test 36share/mysql-test/include/check-testcase.test
37share/mysql-test/include/check_var_limit.inc 37share/mysql-test/include/check_var_limit.inc
38share/mysql-test/include/common-tests.inc 38share/mysql-test/include/common-tests.inc
 39share/mysql-test/include/count_sessions.inc
39share/mysql-test/include/ctype_common.inc 40share/mysql-test/include/ctype_common.inc
40share/mysql-test/include/ctype_filesort.inc 41share/mysql-test/include/ctype_filesort.inc
41share/mysql-test/include/ctype_innodb_like.inc 42share/mysql-test/include/ctype_innodb_like.inc
42share/mysql-test/include/ctype_like_escape.inc 43share/mysql-test/include/ctype_like_escape.inc
43share/mysql-test/include/ctype_like_range_f1f2.inc 44share/mysql-test/include/ctype_like_range_f1f2.inc
44share/mysql-test/include/ctype_regex.inc 45share/mysql-test/include/ctype_regex.inc
45share/mysql-test/include/delete_anonymous_users.inc 46share/mysql-test/include/delete_anonymous_users.inc
 47share/mysql-test/include/diff_master_slave.inc
 48share/mysql-test/include/diff_tables.inc
46share/mysql-test/include/endspace.inc 49share/mysql-test/include/endspace.inc
47share/mysql-test/include/federated.inc 50share/mysql-test/include/federated.inc
48share/mysql-test/include/federated_cleanup.inc 51share/mysql-test/include/federated_cleanup.inc
49share/mysql-test/include/get_binlog_dump_thread_id.inc 52share/mysql-test/include/get_binlog_dump_thread_id.inc
50share/mysql-test/include/gis_generic.inc 53share/mysql-test/include/gis_generic.inc
51share/mysql-test/include/gis_keys.inc 54share/mysql-test/include/gis_keys.inc
52share/mysql-test/include/have_archive.inc 55share/mysql-test/include/have_archive.inc
53share/mysql-test/include/have_bdb.inc 56share/mysql-test/include/have_bdb.inc
54share/mysql-test/include/have_big5.inc 57share/mysql-test/include/have_big5.inc
55share/mysql-test/include/have_blackhole.inc 58share/mysql-test/include/have_blackhole.inc
56share/mysql-test/include/have_bug25714.inc 59share/mysql-test/include/have_bug25714.inc
 60share/mysql-test/include/have_case_insensitive_fs.inc
57share/mysql-test/include/have_case_sensitive_file_system.inc 61share/mysql-test/include/have_case_sensitive_file_system.inc
 62share/mysql-test/include/have_community_features.inc
58share/mysql-test/include/have_compress.inc 63share/mysql-test/include/have_compress.inc
59share/mysql-test/include/have_cp1250_ch.inc 64share/mysql-test/include/have_cp1250_ch.inc
60share/mysql-test/include/have_cp932.inc 65share/mysql-test/include/have_cp932.inc
61share/mysql-test/include/have_crypt.inc 66share/mysql-test/include/have_crypt.inc
62share/mysql-test/include/have_csv.inc 67share/mysql-test/include/have_csv.inc
63share/mysql-test/include/have_debug.inc 68share/mysql-test/include/have_debug.inc
64share/mysql-test/include/have_eucjpms.inc 69share/mysql-test/include/have_eucjpms.inc
65share/mysql-test/include/have_euckr.inc 70share/mysql-test/include/have_euckr.inc
66share/mysql-test/include/have_exampledb.inc 71share/mysql-test/include/have_exampledb.inc
67share/mysql-test/include/have_federated_db.inc 72share/mysql-test/include/have_federated_db.inc
68share/mysql-test/include/have_gb2312.inc 73share/mysql-test/include/have_gb2312.inc
69share/mysql-test/include/have_gbk.inc 74share/mysql-test/include/have_gbk.inc
70share/mysql-test/include/have_geometry.inc 75share/mysql-test/include/have_geometry.inc
71share/mysql-test/include/have_innodb.inc 76share/mysql-test/include/have_innodb.inc
72share/mysql-test/include/have_latin2_ch.inc 77share/mysql-test/include/have_latin2_ch.inc
73share/mysql-test/include/have_local_infile.inc 78share/mysql-test/include/have_local_infile.inc
74share/mysql-test/include/have_log_bin.inc 79share/mysql-test/include/have_log_bin.inc
75share/mysql-test/include/have_lowercase0.inc 80share/mysql-test/include/have_lowercase0.inc
76share/mysql-test/include/have_lowercase1.inc 81share/mysql-test/include/have_lowercase1.inc
77share/mysql-test/include/have_multi_ndb.inc 82share/mysql-test/include/have_multi_ndb.inc
78share/mysql-test/include/have_ndb.inc 83share/mysql-test/include/have_ndb.inc
79share/mysql-test/include/have_outfile.inc 84share/mysql-test/include/have_outfile.inc
 85share/mysql-test/include/have_profiling.inc
80share/mysql-test/include/have_query_cache.inc 86share/mysql-test/include/have_query_cache.inc
81share/mysql-test/include/have_sjis.inc 87share/mysql-test/include/have_sjis.inc
82share/mysql-test/include/have_ssl.inc 88share/mysql-test/include/have_ssl.inc
83share/mysql-test/include/have_tis620.inc 89share/mysql-test/include/have_tis620.inc
84share/mysql-test/include/have_ucs2.inc 90share/mysql-test/include/have_ucs2.inc
85share/mysql-test/include/have_udf.inc 91share/mysql-test/include/have_udf.inc
86share/mysql-test/include/have_ujis.inc 92share/mysql-test/include/have_ujis.inc
87share/mysql-test/include/im_check_env.inc 93share/mysql-test/include/im_check_env.inc
88share/mysql-test/include/innodb_rollback_on_timeout.inc 94share/mysql-test/include/innodb_rollback_on_timeout.inc
 95share/mysql-test/include/kill_query.inc
 96share/mysql-test/include/kill_query_and_diff_master_slave.inc
89share/mysql-test/include/loaddata_autocom.inc 97share/mysql-test/include/loaddata_autocom.inc
 98share/mysql-test/include/master-slave-end.inc
90share/mysql-test/include/master-slave.inc 99share/mysql-test/include/master-slave.inc
 100share/mysql-test/include/mysqldump.inc
91share/mysql-test/include/mysqltest-x.inc 101share/mysql-test/include/mysqltest-x.inc
92share/mysql-test/include/ndb_backup.inc 102share/mysql-test/include/ndb_backup.inc
93share/mysql-test/include/ndb_backup_print.inc 103share/mysql-test/include/ndb_backup_print.inc
94share/mysql-test/include/ndb_default_cluster.inc 104share/mysql-test/include/ndb_default_cluster.inc
95share/mysql-test/include/ndb_wait_connected.inc 105share/mysql-test/include/ndb_wait_connected.inc
96share/mysql-test/include/not_as_root.inc 106share/mysql-test/include/not_as_root.inc
97share/mysql-test/include/not_embedded.inc 107share/mysql-test/include/not_embedded.inc
98share/mysql-test/include/not_openssl.inc 108share/mysql-test/include/not_openssl.inc
99share/mysql-test/include/not_windows.inc 109share/mysql-test/include/not_windows.inc
100share/mysql-test/include/ps_conv.inc 110share/mysql-test/include/ps_conv.inc
101share/mysql-test/include/ps_create.inc 111share/mysql-test/include/ps_create.inc
102share/mysql-test/include/ps_modify.inc 112share/mysql-test/include/ps_modify.inc
103share/mysql-test/include/ps_modify1.inc 113share/mysql-test/include/ps_modify1.inc
104share/mysql-test/include/ps_query.inc 114share/mysql-test/include/ps_query.inc
105share/mysql-test/include/ps_renew.inc 115share/mysql-test/include/ps_renew.inc
106share/mysql-test/include/report-features.test 116share/mysql-test/include/report-features.test
 117share/mysql-test/include/rpl_loaddata_charset.inc
107share/mysql-test/include/rpl_stmt_seq.inc 118share/mysql-test/include/rpl_stmt_seq.inc
 119share/mysql-test/include/rpl_trigger_common.inc
108share/mysql-test/include/show_binary_logs.inc 120share/mysql-test/include/show_binary_logs.inc
109share/mysql-test/include/show_binlog_events.inc 121share/mysql-test/include/show_binlog_events.inc
110share/mysql-test/include/show_binlog_events2.inc 122share/mysql-test/include/show_binlog_events2.inc
111share/mysql-test/include/show_msg.inc 123share/mysql-test/include/show_msg.inc
112share/mysql-test/include/show_msg80.inc 124share/mysql-test/include/show_msg80.inc
113share/mysql-test/include/sp-vars.inc 125share/mysql-test/include/sp-vars.inc
 126share/mysql-test/include/start_slave.inc
 127share/mysql-test/include/stop_slave.inc
114share/mysql-test/include/strict_autoinc.inc 128share/mysql-test/include/strict_autoinc.inc
115share/mysql-test/include/system_db_struct.inc 129share/mysql-test/include/system_db_struct.inc
116share/mysql-test/include/test_outfile.inc 130share/mysql-test/include/test_outfile.inc
117share/mysql-test/include/testdb_only.inc 131share/mysql-test/include/testdb_only.inc
118share/mysql-test/include/uses_vardir.inc 132share/mysql-test/include/uses_vardir.inc
119share/mysql-test/include/varchar.inc 133share/mysql-test/include/varchar.inc
120share/mysql-test/include/wait_condition.inc 134share/mysql-test/include/wait_condition.inc
121share/mysql-test/include/wait_for_query_to_suceed.inc 135share/mysql-test/include/wait_for_query_to_suceed.inc
122share/mysql-test/include/wait_for_slave_io_to_stop.inc 136share/mysql-test/include/wait_for_slave_io_to_stop.inc
123share/mysql-test/include/wait_for_slave_param.inc 137share/mysql-test/include/wait_for_slave_param.inc
 138share/mysql-test/include/wait_for_slave_sql_error.inc
 139share/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
124share/mysql-test/include/wait_for_slave_sql_to_stop.inc 140share/mysql-test/include/wait_for_slave_sql_to_stop.inc
125share/mysql-test/include/wait_for_slave_to_start.inc 141share/mysql-test/include/wait_for_slave_to_start.inc
126share/mysql-test/include/wait_for_slave_to_stop.inc 142share/mysql-test/include/wait_for_slave_to_stop.inc
 143share/mysql-test/include/wait_show_condition.inc
127share/mysql-test/include/wait_show_pattern.inc 144share/mysql-test/include/wait_show_pattern.inc
128share/mysql-test/include/wait_slave_status.inc 145share/mysql-test/include/wait_slave_status.inc
 146share/mysql-test/include/wait_until_count_sessions.inc
 147share/mysql-test/include/wait_until_disconnected.inc
129share/mysql-test/include/windows.inc 148share/mysql-test/include/windows.inc
130share/mysql-test/install_test_db 149share/mysql-test/install_test_db
131share/mysql-test/lib/mtr_cases.pl 150share/mysql-test/lib/mtr_cases.pl
132share/mysql-test/lib/mtr_diff.pl 151share/mysql-test/lib/mtr_diff.pl
133share/mysql-test/lib/mtr_gcov.pl 152share/mysql-test/lib/mtr_gcov.pl
134share/mysql-test/lib/mtr_gprof.pl 153share/mysql-test/lib/mtr_gprof.pl
135share/mysql-test/lib/mtr_im.pl 154share/mysql-test/lib/mtr_im.pl
136share/mysql-test/lib/mtr_io.pl 155share/mysql-test/lib/mtr_io.pl
137share/mysql-test/lib/mtr_match.pl 156share/mysql-test/lib/mtr_match.pl
138share/mysql-test/lib/mtr_misc.pl 157share/mysql-test/lib/mtr_misc.pl
139share/mysql-test/lib/mtr_process.pl 158share/mysql-test/lib/mtr_process.pl
140share/mysql-test/lib/mtr_report.pl 159share/mysql-test/lib/mtr_report.pl
141share/mysql-test/lib/mtr_stress.pl 160share/mysql-test/lib/mtr_stress.pl
@@ -169,28 +188,32 @@ share/mysql-test/r/bdb_notembedded.resul @@ -169,28 +188,32 @@ share/mysql-test/r/bdb_notembedded.resul
169share/mysql-test/r/bench_count_distinct.result 188share/mysql-test/r/bench_count_distinct.result
170share/mysql-test/r/big_test.require 189share/mysql-test/r/big_test.require
171share/mysql-test/r/bigint.result 190share/mysql-test/r/bigint.result
172share/mysql-test/r/binary.result 191share/mysql-test/r/binary.result
173share/mysql-test/r/binlog.result 192share/mysql-test/r/binlog.result
174share/mysql-test/r/binlog_index.result 193share/mysql-test/r/binlog_index.result
175share/mysql-test/r/binlog_innodb.result 194share/mysql-test/r/binlog_innodb.result
176share/mysql-test/r/binlog_killed.result 195share/mysql-test/r/binlog_killed.result
177share/mysql-test/r/binlog_killed_simulate.result 196share/mysql-test/r/binlog_killed_simulate.result
178share/mysql-test/r/binlog_start_comment.result 197share/mysql-test/r/binlog_start_comment.result
179share/mysql-test/r/blackhole.result 198share/mysql-test/r/blackhole.result
180share/mysql-test/r/bool.result 199share/mysql-test/r/bool.result
181share/mysql-test/r/bootstrap.result 200share/mysql-test/r/bootstrap.result
 201share/mysql-test/r/bug40113.result
 202share/mysql-test/r/bug41756.result
 203share/mysql-test/r/bug46080.result
182share/mysql-test/r/bulk_replace.result 204share/mysql-test/r/bulk_replace.result
183share/mysql-test/r/case.result 205share/mysql-test/r/case.result
 206share/mysql-test/r/case_insensitive_fs.require
184share/mysql-test/r/case_sensitive_file_system.require 207share/mysql-test/r/case_sensitive_file_system.require
185share/mysql-test/r/cast.result 208share/mysql-test/r/cast.result
186share/mysql-test/r/check.result 209share/mysql-test/r/check.result
187share/mysql-test/r/check_var_limit.require 210share/mysql-test/r/check_var_limit.require
188share/mysql-test/r/client_xml.result 211share/mysql-test/r/client_xml.result
189share/mysql-test/r/comments.result 212share/mysql-test/r/comments.result
190share/mysql-test/r/compare.result 213share/mysql-test/r/compare.result
191share/mysql-test/r/compress.result 214share/mysql-test/r/compress.result
192share/mysql-test/r/connect.result 215share/mysql-test/r/connect.result
193share/mysql-test/r/consistent_snapshot.result 216share/mysql-test/r/consistent_snapshot.result
194share/mysql-test/r/constraints.result 217share/mysql-test/r/constraints.result
195share/mysql-test/r/count_distinct.result 218share/mysql-test/r/count_distinct.result
196share/mysql-test/r/count_distinct2.result 219share/mysql-test/r/count_distinct2.result
@@ -199,26 +222,27 @@ share/mysql-test/r/create.result @@ -199,26 +222,27 @@ share/mysql-test/r/create.result
199share/mysql-test/r/create_not_windows.result 222share/mysql-test/r/create_not_windows.result
200share/mysql-test/r/create_select_tmp.result 223share/mysql-test/r/create_select_tmp.result
201share/mysql-test/r/csv.result 224share/mysql-test/r/csv.result
202share/mysql-test/r/ctype_ascii.result 225share/mysql-test/r/ctype_ascii.result
203share/mysql-test/r/ctype_big5.result 226share/mysql-test/r/ctype_big5.result
204share/mysql-test/r/ctype_collate.result 227share/mysql-test/r/ctype_collate.result
205share/mysql-test/r/ctype_cp1250_ch.result 228share/mysql-test/r/ctype_cp1250_ch.result
206share/mysql-test/r/ctype_cp1251.result 229share/mysql-test/r/ctype_cp1251.result
207share/mysql-test/r/ctype_cp932.result 230share/mysql-test/r/ctype_cp932.result
208share/mysql-test/r/ctype_cp932_binlog.result 231share/mysql-test/r/ctype_cp932_binlog.result
209share/mysql-test/r/ctype_create.result 232share/mysql-test/r/ctype_create.result
210share/mysql-test/r/ctype_eucjpms.result 233share/mysql-test/r/ctype_eucjpms.result
211share/mysql-test/r/ctype_euckr.result 234share/mysql-test/r/ctype_euckr.result
 235share/mysql-test/r/ctype_filesystem.result
212share/mysql-test/r/ctype_gb2312.result 236share/mysql-test/r/ctype_gb2312.result
213share/mysql-test/r/ctype_gbk.result 237share/mysql-test/r/ctype_gbk.result
214share/mysql-test/r/ctype_hebrew.result 238share/mysql-test/r/ctype_hebrew.result
215share/mysql-test/r/ctype_latin1.result 239share/mysql-test/r/ctype_latin1.result
216share/mysql-test/r/ctype_latin1_de.result 240share/mysql-test/r/ctype_latin1_de.result
217share/mysql-test/r/ctype_latin2.result 241share/mysql-test/r/ctype_latin2.result
218share/mysql-test/r/ctype_latin2_ch.result 242share/mysql-test/r/ctype_latin2_ch.result
219share/mysql-test/r/ctype_ldml.result 243share/mysql-test/r/ctype_ldml.result
220share/mysql-test/r/ctype_many.result 244share/mysql-test/r/ctype_many.result
221share/mysql-test/r/ctype_mb.result 245share/mysql-test/r/ctype_mb.result
222share/mysql-test/r/ctype_recoding.result 246share/mysql-test/r/ctype_recoding.result
223share/mysql-test/r/ctype_sjis.result 247share/mysql-test/r/ctype_sjis.result
224share/mysql-test/r/ctype_tis620.result 248share/mysql-test/r/ctype_tis620.result
@@ -238,26 +262,27 @@ share/mysql-test/r/distinct.result @@ -238,26 +262,27 @@ share/mysql-test/r/distinct.result
238share/mysql-test/r/drop.result 262share/mysql-test/r/drop.result
239share/mysql-test/r/drop_temp_table.result 263share/mysql-test/r/drop_temp_table.result
240share/mysql-test/r/empty_table.result 264share/mysql-test/r/empty_table.result
241share/mysql-test/r/endspace.result 265share/mysql-test/r/endspace.result
242share/mysql-test/r/error_simulation.result 266share/mysql-test/r/error_simulation.result
243share/mysql-test/r/errors.result 267share/mysql-test/r/errors.result
244share/mysql-test/r/exampledb.result 268share/mysql-test/r/exampledb.result
245share/mysql-test/r/execution_constants.result 269share/mysql-test/r/execution_constants.result
246share/mysql-test/r/explain.result 270share/mysql-test/r/explain.result
247share/mysql-test/r/federated.result 271share/mysql-test/r/federated.result
248share/mysql-test/r/federated_archive.result 272share/mysql-test/r/federated_archive.result
249share/mysql-test/r/federated_bug_13118.result 273share/mysql-test/r/federated_bug_13118.result
250share/mysql-test/r/federated_bug_25714.result 274share/mysql-test/r/federated_bug_25714.result
 275share/mysql-test/r/federated_debug.result
251share/mysql-test/r/federated_disabled.result 276share/mysql-test/r/federated_disabled.result
252share/mysql-test/r/federated_innodb.result 277share/mysql-test/r/federated_innodb.result
253share/mysql-test/r/fix_priv_tables.result 278share/mysql-test/r/fix_priv_tables.result
254share/mysql-test/r/flush.result 279share/mysql-test/r/flush.result
255share/mysql-test/r/flush2.result 280share/mysql-test/r/flush2.result
256share/mysql-test/r/flush_block_commit.result 281share/mysql-test/r/flush_block_commit.result
257share/mysql-test/r/flush_block_commit_notembedded.result 282share/mysql-test/r/flush_block_commit_notembedded.result
258share/mysql-test/r/flush_read_lock_kill.result 283share/mysql-test/r/flush_read_lock_kill.result
259share/mysql-test/r/flush_table.result 284share/mysql-test/r/flush_table.result
260share/mysql-test/r/foreign_key.result 285share/mysql-test/r/foreign_key.result
261share/mysql-test/r/fulltext.result 286share/mysql-test/r/fulltext.result
262share/mysql-test/r/fulltext2.result 287share/mysql-test/r/fulltext2.result
263share/mysql-test/r/fulltext3.result 288share/mysql-test/r/fulltext3.result
@@ -291,59 +316,62 @@ share/mysql-test/r/func_sapdb.result @@ -291,59 +316,62 @@ share/mysql-test/r/func_sapdb.result
291share/mysql-test/r/func_set.result 316share/mysql-test/r/func_set.result
292share/mysql-test/r/func_str.result 317share/mysql-test/r/func_str.result
293share/mysql-test/r/func_system.result 318share/mysql-test/r/func_system.result
294share/mysql-test/r/func_test.result 319share/mysql-test/r/func_test.result
295share/mysql-test/r/func_time.result 320share/mysql-test/r/func_time.result
296share/mysql-test/r/func_timestamp.result 321share/mysql-test/r/func_timestamp.result
297share/mysql-test/r/gcc296.result 322share/mysql-test/r/gcc296.result
298share/mysql-test/r/gis-rtree.result 323share/mysql-test/r/gis-rtree.result
299share/mysql-test/r/gis.result 324share/mysql-test/r/gis.result
300share/mysql-test/r/grant.result 325share/mysql-test/r/grant.result
301share/mysql-test/r/grant2.result 326share/mysql-test/r/grant2.result
302share/mysql-test/r/grant3.result 327share/mysql-test/r/grant3.result
303share/mysql-test/r/grant_cache.result 328share/mysql-test/r/grant_cache.result
 329share/mysql-test/r/grant_lowercase_fs.result
304share/mysql-test/r/greedy_optimizer.result 330share/mysql-test/r/greedy_optimizer.result
305share/mysql-test/r/group_by.result 331share/mysql-test/r/group_by.result
306share/mysql-test/r/group_min_max.result 332share/mysql-test/r/group_min_max.result
307share/mysql-test/r/handler.result 333share/mysql-test/r/handler.result
308share/mysql-test/r/have_archive.require 334share/mysql-test/r/have_archive.require
309share/mysql-test/r/have_bdb.require 335share/mysql-test/r/have_bdb.require
310share/mysql-test/r/have_big5.require 336share/mysql-test/r/have_big5.require
311share/mysql-test/r/have_blackhole.require 337share/mysql-test/r/have_blackhole.require
312share/mysql-test/r/have_bug25714.require 338share/mysql-test/r/have_bug25714.require
 339share/mysql-test/r/have_community_features.require
313share/mysql-test/r/have_compress.require 340share/mysql-test/r/have_compress.require
314share/mysql-test/r/have_cp1250_ch.require 341share/mysql-test/r/have_cp1250_ch.require
315share/mysql-test/r/have_cp932.require 342share/mysql-test/r/have_cp932.require
316share/mysql-test/r/have_crypt.require 343share/mysql-test/r/have_crypt.require
317share/mysql-test/r/have_csv.require 344share/mysql-test/r/have_csv.require
318share/mysql-test/r/have_debug.require 345share/mysql-test/r/have_debug.require
319share/mysql-test/r/have_eucjpms.require 346share/mysql-test/r/have_eucjpms.require
320share/mysql-test/r/have_euckr.require 347share/mysql-test/r/have_euckr.require
321share/mysql-test/r/have_exampledb.require 348share/mysql-test/r/have_exampledb.require
322share/mysql-test/r/have_federated_db.require 349share/mysql-test/r/have_federated_db.require
323share/mysql-test/r/have_gb2312.require 350share/mysql-test/r/have_gb2312.require
324share/mysql-test/r/have_gbk.require 351share/mysql-test/r/have_gbk.require
325share/mysql-test/r/have_geometry.require 352share/mysql-test/r/have_geometry.require
326share/mysql-test/r/have_innodb.require 353share/mysql-test/r/have_innodb.require
327share/mysql-test/r/have_latin2_ch.require 354share/mysql-test/r/have_latin2_ch.require
328share/mysql-test/r/have_local_infile.require 355share/mysql-test/r/have_local_infile.require
329share/mysql-test/r/have_log_bin.require 356share/mysql-test/r/have_log_bin.require
330share/mysql-test/r/have_met_timezone.require 357share/mysql-test/r/have_met_timezone.require
331share/mysql-test/r/have_moscow_leap_timezone.require 358share/mysql-test/r/have_moscow_leap_timezone.require
332share/mysql-test/r/have_mysql_upgrade.result 359share/mysql-test/r/have_mysql_upgrade.result
333share/mysql-test/r/have_ndb.require 360share/mysql-test/r/have_ndb.require
334share/mysql-test/r/have_ndb_status_ok.require 361share/mysql-test/r/have_ndb_status_ok.require
335share/mysql-test/r/have_outfile.require 362share/mysql-test/r/have_outfile.require
336share/mysql-test/r/have_perror.require 363share/mysql-test/r/have_perror.require
 364share/mysql-test/r/have_profiling.require
337share/mysql-test/r/have_query_cache.require 365share/mysql-test/r/have_query_cache.require
338share/mysql-test/r/have_raid.require 366share/mysql-test/r/have_raid.require
339share/mysql-test/r/have_sjis.require 367share/mysql-test/r/have_sjis.require
340share/mysql-test/r/have_ssl.require 368share/mysql-test/r/have_ssl.require
341share/mysql-test/r/have_symlink.require 369share/mysql-test/r/have_symlink.require
342share/mysql-test/r/have_tis620.require 370share/mysql-test/r/have_tis620.require
343share/mysql-test/r/have_ucs2.require 371share/mysql-test/r/have_ucs2.require
344share/mysql-test/r/have_udf.require 372share/mysql-test/r/have_udf.require
345share/mysql-test/r/have_udf_example.require 373share/mysql-test/r/have_udf_example.require
346share/mysql-test/r/have_ujis.require 374share/mysql-test/r/have_ujis.require
347share/mysql-test/r/having.result 375share/mysql-test/r/having.result
348share/mysql-test/r/heap.result 376share/mysql-test/r/heap.result
349share/mysql-test/r/heap_auto_increment.result 377share/mysql-test/r/heap_auto_increment.result
@@ -353,36 +381,41 @@ share/mysql-test/r/help.result @@ -353,36 +381,41 @@ share/mysql-test/r/help.result
353share/mysql-test/r/im_daemon_life_cycle.result 381share/mysql-test/r/im_daemon_life_cycle.result
354share/mysql-test/r/im_life_cycle.result 382share/mysql-test/r/im_life_cycle.result
355share/mysql-test/r/im_options_set.result 383share/mysql-test/r/im_options_set.result
356share/mysql-test/r/im_options_unset.result 384share/mysql-test/r/im_options_unset.result
357share/mysql-test/r/im_utils.result 385share/mysql-test/r/im_utils.result
358share/mysql-test/r/index_merge.result 386share/mysql-test/r/index_merge.result
359share/mysql-test/r/index_merge_bdb.result 387share/mysql-test/r/index_merge_bdb.result
360share/mysql-test/r/index_merge_innodb.result 388share/mysql-test/r/index_merge_innodb.result
361share/mysql-test/r/index_merge_innodb2.result 389share/mysql-test/r/index_merge_innodb2.result
362share/mysql-test/r/index_merge_ror.result 390share/mysql-test/r/index_merge_ror.result
363share/mysql-test/r/index_merge_ror_cpk.result 391share/mysql-test/r/index_merge_ror_cpk.result
364share/mysql-test/r/information_schema.result 392share/mysql-test/r/information_schema.result
365share/mysql-test/r/information_schema_chmod.result 393share/mysql-test/r/information_schema_chmod.result
 394share/mysql-test/r/information_schema_community.result
366share/mysql-test/r/information_schema_db.result 395share/mysql-test/r/information_schema_db.result
367share/mysql-test/r/information_schema_inno.result 396share/mysql-test/r/information_schema_inno.result
368share/mysql-test/r/init_connect.result 397share/mysql-test/r/init_connect.result
369share/mysql-test/r/init_file.result 398share/mysql-test/r/init_file.result
 399share/mysql-test/r/innodb-autoinc-optimize.result
370share/mysql-test/r/innodb-big.result 400share/mysql-test/r/innodb-big.result
371share/mysql-test/r/innodb-deadlock.result 401share/mysql-test/r/innodb-deadlock.result
372share/mysql-test/r/innodb-lock.result 402share/mysql-test/r/innodb-lock.result
373share/mysql-test/r/innodb-replace.result 403share/mysql-test/r/innodb-replace.result
374share/mysql-test/r/innodb-ucs2.result 404share/mysql-test/r/innodb-ucs2.result
375share/mysql-test/r/innodb.result 405share/mysql-test/r/innodb.result
 406share/mysql-test/r/innodb_bug35220.result
 407share/mysql-test/r/innodb_bug40565.result
 408share/mysql-test/r/innodb_bug42419.result
376share/mysql-test/r/innodb_cache.result 409share/mysql-test/r/innodb_cache.result
377share/mysql-test/r/innodb_gis.result 410share/mysql-test/r/innodb_gis.result
378share/mysql-test/r/innodb_handler.result 411share/mysql-test/r/innodb_handler.result
379share/mysql-test/r/innodb_mysql.result 412share/mysql-test/r/innodb_mysql.result
380share/mysql-test/r/innodb_notembedded.result 413share/mysql-test/r/innodb_notembedded.result
381share/mysql-test/r/innodb_timeout_rollback.result 414share/mysql-test/r/innodb_timeout_rollback.result
382share/mysql-test/r/innodb_unsafe_binlog.result 415share/mysql-test/r/innodb_unsafe_binlog.result
383share/mysql-test/r/insert.result 416share/mysql-test/r/insert.result
384share/mysql-test/r/insert_notembedded.result 417share/mysql-test/r/insert_notembedded.result
385share/mysql-test/r/insert_select-binlog.result 418share/mysql-test/r/insert_select-binlog.result
386share/mysql-test/r/insert_select.result 419share/mysql-test/r/insert_select.result
387share/mysql-test/r/insert_update.result 420share/mysql-test/r/insert_update.result
388share/mysql-test/r/is_debug_build.require 421share/mysql-test/r/is_debug_build.require
@@ -393,62 +426,69 @@ share/mysql-test/r/join_nested.result @@ -393,62 +426,69 @@ share/mysql-test/r/join_nested.result
393share/mysql-test/r/join_outer.result 426share/mysql-test/r/join_outer.result
394share/mysql-test/r/key.result 427share/mysql-test/r/key.result
395share/mysql-test/r/key_cache.result 428share/mysql-test/r/key_cache.result
396share/mysql-test/r/key_diff.result 429share/mysql-test/r/key_diff.result
397share/mysql-test/r/key_primary.result 430share/mysql-test/r/key_primary.result
398share/mysql-test/r/keywords.result 431share/mysql-test/r/keywords.result
399share/mysql-test/r/kill.result 432share/mysql-test/r/kill.result
400share/mysql-test/r/limit.result 433share/mysql-test/r/limit.result
401share/mysql-test/r/loaddata.result 434share/mysql-test/r/loaddata.result
402share/mysql-test/r/loaddata_autocom_innodb.result 435share/mysql-test/r/loaddata_autocom_innodb.result
403share/mysql-test/r/loaddata_autocom_ndb.result 436share/mysql-test/r/loaddata_autocom_ndb.result
404share/mysql-test/r/lock.result 437share/mysql-test/r/lock.result
405share/mysql-test/r/lock_multi.result 438share/mysql-test/r/lock_multi.result
 439share/mysql-test/r/lock_multi_bug38499.result
 440share/mysql-test/r/lock_multi_bug38691.result
406share/mysql-test/r/lock_tables_lost_commit.result 441share/mysql-test/r/lock_tables_lost_commit.result
407share/mysql-test/r/long_tmpdir.result 442share/mysql-test/r/long_tmpdir.result
408share/mysql-test/r/lowercase0.require 443share/mysql-test/r/lowercase0.require
409share/mysql-test/r/lowercase1.require 444share/mysql-test/r/lowercase1.require
410share/mysql-test/r/lowercase2.require 445share/mysql-test/r/lowercase2.require
411share/mysql-test/r/lowercase_fs_off.result 446share/mysql-test/r/lowercase_fs_off.result
412share/mysql-test/r/lowercase_mixed_tmpdir.result 447share/mysql-test/r/lowercase_mixed_tmpdir.result
413share/mysql-test/r/lowercase_table.result 448share/mysql-test/r/lowercase_table.result
414share/mysql-test/r/lowercase_table2.result 449share/mysql-test/r/lowercase_table2.result
415share/mysql-test/r/lowercase_table3.result 450share/mysql-test/r/lowercase_table3.result
416share/mysql-test/r/lowercase_table_grant.result 451share/mysql-test/r/lowercase_table_grant.result
417share/mysql-test/r/lowercase_table_qcache.result 452share/mysql-test/r/lowercase_table_qcache.result
 453share/mysql-test/r/lowercase_utf8.result
418share/mysql-test/r/lowercase_view.result 454share/mysql-test/r/lowercase_view.result
419share/mysql-test/r/merge.result 455share/mysql-test/r/merge.result
420share/mysql-test/r/metadata.result 456share/mysql-test/r/metadata.result
421share/mysql-test/r/mix_innodb_myisam_binlog.result 457share/mysql-test/r/mix_innodb_myisam_binlog.result
422share/mysql-test/r/multi_statement.result 458share/mysql-test/r/multi_statement.result
423share/mysql-test/r/multi_update.result 459share/mysql-test/r/multi_update.result
 460share/mysql-test/r/multi_update2.result
424share/mysql-test/r/multi_update_tiny_hash.result 461share/mysql-test/r/multi_update_tiny_hash.result
425share/mysql-test/r/myisam-blob.result 462share/mysql-test/r/myisam-blob.result
426share/mysql-test/r/myisam.result 463share/mysql-test/r/myisam.result
427share/mysql-test/r/myisampack.result 464share/mysql-test/r/myisampack.result
 465share/mysql-test/r/mysql-bug41486.result
 466share/mysql-test/r/mysql-bug45236.result
428share/mysql-test/r/mysql.result 467share/mysql-test/r/mysql.result
429share/mysql-test/r/mysql_client_test.result 468share/mysql-test/r/mysql_client_test.result
430share/mysql-test/r/mysql_comments.result 469share/mysql-test/r/mysql_comments.result
431share/mysql-test/r/mysql_protocols.result 470share/mysql-test/r/mysql_protocols.result
432share/mysql-test/r/mysql_upgrade.result 471share/mysql-test/r/mysql_upgrade.result
433share/mysql-test/r/mysqladmin.result 472share/mysql-test/r/mysqladmin.result
434share/mysql-test/r/mysqlbinlog-cp932.result 473share/mysql-test/r/mysqlbinlog-cp932.result
435share/mysql-test/r/mysqlbinlog.result 474share/mysql-test/r/mysqlbinlog.result
436share/mysql-test/r/mysqlbinlog2.result 475share/mysql-test/r/mysqlbinlog2.result
437share/mysql-test/r/mysqlcheck.result 476share/mysql-test/r/mysqlcheck.result
438share/mysql-test/r/mysqldump-compat.result 477share/mysql-test/r/mysqldump-compat.result
439share/mysql-test/r/mysqldump-max.result 478share/mysql-test/r/mysqldump-max.result
440share/mysql-test/r/mysqldump-no-binlog.result 479share/mysql-test/r/mysqldump-no-binlog.result
441share/mysql-test/r/mysqldump.result 480share/mysql-test/r/mysqldump.result
 481share/mysql-test/r/mysqldump_restore.result
442share/mysql-test/r/mysqlshow.result 482share/mysql-test/r/mysqlshow.result
443share/mysql-test/r/mysqltest.result 483share/mysql-test/r/mysqltest.result
444share/mysql-test/r/named_pipe.result 484share/mysql-test/r/named_pipe.result
445share/mysql-test/r/ndb_alter_table.result 485share/mysql-test/r/ndb_alter_table.result
446share/mysql-test/r/ndb_alter_table2.result 486share/mysql-test/r/ndb_alter_table2.result
447share/mysql-test/r/ndb_auto_increment.result 487share/mysql-test/r/ndb_auto_increment.result
448share/mysql-test/r/ndb_autodiscover.result 488share/mysql-test/r/ndb_autodiscover.result
449share/mysql-test/r/ndb_autodiscover2.result 489share/mysql-test/r/ndb_autodiscover2.result
450share/mysql-test/r/ndb_autodiscover3.result 490share/mysql-test/r/ndb_autodiscover3.result
451share/mysql-test/r/ndb_backup_print.result 491share/mysql-test/r/ndb_backup_print.result
452share/mysql-test/r/ndb_basic.result 492share/mysql-test/r/ndb_basic.result
453share/mysql-test/r/ndb_bitfield.result 493share/mysql-test/r/ndb_bitfield.result
454share/mysql-test/r/ndb_blob.result 494share/mysql-test/r/ndb_blob.result
@@ -497,26 +537,28 @@ share/mysql-test/r/null.result @@ -497,26 +537,28 @@ share/mysql-test/r/null.result
497share/mysql-test/r/null_key.result 537share/mysql-test/r/null_key.result
498share/mysql-test/r/odbc.result 538share/mysql-test/r/odbc.result
499share/mysql-test/r/olap.result 539share/mysql-test/r/olap.result
500share/mysql-test/r/openssl_1.result 540share/mysql-test/r/openssl_1.result
501share/mysql-test/r/openssl_2.result 541share/mysql-test/r/openssl_2.result
502share/mysql-test/r/order_by.result 542share/mysql-test/r/order_by.result
503share/mysql-test/r/order_fill_sortbuf.result 543share/mysql-test/r/order_fill_sortbuf.result
504share/mysql-test/r/outfile.result 544share/mysql-test/r/outfile.result
505share/mysql-test/r/outfile_loaddata.result 545share/mysql-test/r/outfile_loaddata.result
506share/mysql-test/r/overflow.result 546share/mysql-test/r/overflow.result
507share/mysql-test/r/packet.result 547share/mysql-test/r/packet.result
508share/mysql-test/r/parser.result 548share/mysql-test/r/parser.result
509share/mysql-test/r/parser_precedence.result 549share/mysql-test/r/parser_precedence.result
 550share/mysql-test/r/parser_stack.result
 551share/mysql-test/r/perror-win.result
510share/mysql-test/r/perror.result 552share/mysql-test/r/perror.result
511share/mysql-test/r/preload.result 553share/mysql-test/r/preload.result
512share/mysql-test/r/profiling.result 554share/mysql-test/r/profiling.result
513share/mysql-test/r/ps.result 555share/mysql-test/r/ps.result
514share/mysql-test/r/ps_10nestset.result 556share/mysql-test/r/ps_10nestset.result
515share/mysql-test/r/ps_11bugs.result 557share/mysql-test/r/ps_11bugs.result
516share/mysql-test/r/ps_1general.result 558share/mysql-test/r/ps_1general.result
517share/mysql-test/r/ps_2myisam.result 559share/mysql-test/r/ps_2myisam.result
518share/mysql-test/r/ps_3innodb.result 560share/mysql-test/r/ps_3innodb.result
519share/mysql-test/r/ps_4heap.result 561share/mysql-test/r/ps_4heap.result
520share/mysql-test/r/ps_5merge.result 562share/mysql-test/r/ps_5merge.result
521share/mysql-test/r/ps_6bdb.result 563share/mysql-test/r/ps_6bdb.result
522share/mysql-test/r/ps_7ndb.result 564share/mysql-test/r/ps_7ndb.result
@@ -548,81 +590,87 @@ share/mysql-test/r/rpl000006.result @@ -548,81 +590,87 @@ share/mysql-test/r/rpl000006.result
548share/mysql-test/r/rpl000008.result 590share/mysql-test/r/rpl000008.result
549share/mysql-test/r/rpl000009.result 591share/mysql-test/r/rpl000009.result
550share/mysql-test/r/rpl000010.result 592share/mysql-test/r/rpl000010.result
551share/mysql-test/r/rpl000011.result 593share/mysql-test/r/rpl000011.result
552share/mysql-test/r/rpl000012.result 594share/mysql-test/r/rpl000012.result
553share/mysql-test/r/rpl000013.result 595share/mysql-test/r/rpl000013.result
554share/mysql-test/r/rpl000015.result 596share/mysql-test/r/rpl000015.result
555share/mysql-test/r/rpl000017.result 597share/mysql-test/r/rpl000017.result
556share/mysql-test/r/rpl_EE_error.result 598share/mysql-test/r/rpl_EE_error.result
557share/mysql-test/r/rpl_alter.result 599share/mysql-test/r/rpl_alter.result
558share/mysql-test/r/rpl_auto_increment.result 600share/mysql-test/r/rpl_auto_increment.result
559share/mysql-test/r/rpl_auto_increment_11932.result 601share/mysql-test/r/rpl_auto_increment_11932.result
560share/mysql-test/r/rpl_auto_increment_bug33029.result 602share/mysql-test/r/rpl_auto_increment_bug33029.result
 603share/mysql-test/r/rpl_begin_commit_rollback.result
561share/mysql-test/r/rpl_bug33931.result 604share/mysql-test/r/rpl_bug33931.result
 605share/mysql-test/r/rpl_bug38694.result
562share/mysql-test/r/rpl_change_master.result 606share/mysql-test/r/rpl_change_master.result
563share/mysql-test/r/rpl_charset.result 607share/mysql-test/r/rpl_charset.result
564share/mysql-test/r/rpl_charset_sjis.result 608share/mysql-test/r/rpl_charset_sjis.result
565share/mysql-test/r/rpl_commit_after_flush.result 609share/mysql-test/r/rpl_commit_after_flush.result
566share/mysql-test/r/rpl_create_database.result 610share/mysql-test/r/rpl_create_database.result
567share/mysql-test/r/rpl_critical_errors.result 611share/mysql-test/r/rpl_critical_errors.result
568share/mysql-test/r/rpl_ddl.result 612share/mysql-test/r/rpl_ddl.result
569share/mysql-test/r/rpl_deadlock.result 613share/mysql-test/r/rpl_deadlock.result
570share/mysql-test/r/rpl_delete_all.result 614share/mysql-test/r/rpl_delete_all.result
571share/mysql-test/r/rpl_do_grant.result 615share/mysql-test/r/rpl_do_grant.result
572share/mysql-test/r/rpl_drop.result 616share/mysql-test/r/rpl_drop.result
573share/mysql-test/r/rpl_drop_db.result 617share/mysql-test/r/rpl_drop_db.result
 618share/mysql-test/r/rpl_drop_if_exists.result
574share/mysql-test/r/rpl_drop_temp.result 619share/mysql-test/r/rpl_drop_temp.result
575share/mysql-test/r/rpl_drop_view.result 620share/mysql-test/r/rpl_drop_view.result
576share/mysql-test/r/rpl_dual_pos_advance.result 621share/mysql-test/r/rpl_dual_pos_advance.result
577share/mysql-test/r/rpl_empty_master_crash.result 622share/mysql-test/r/rpl_empty_master_crash.result
578share/mysql-test/r/rpl_error_ignored_table.result 623share/mysql-test/r/rpl_error_ignored_table.result
579share/mysql-test/r/rpl_failed_optimize.result 624share/mysql-test/r/rpl_failed_optimize.result
 625share/mysql-test/r/rpl_filter_tables_not_exist.result
580share/mysql-test/r/rpl_flush_log_loop.result 626share/mysql-test/r/rpl_flush_log_loop.result
581share/mysql-test/r/rpl_flush_tables.result 627share/mysql-test/r/rpl_flush_tables.result
582share/mysql-test/r/rpl_free_items.result 628share/mysql-test/r/rpl_free_items.result
583share/mysql-test/r/rpl_get_lock.result 629share/mysql-test/r/rpl_get_lock.result
584share/mysql-test/r/rpl_grant.result 630share/mysql-test/r/rpl_grant.result
585share/mysql-test/r/rpl_ignore_grant.result 631share/mysql-test/r/rpl_ignore_grant.result
586share/mysql-test/r/rpl_ignore_revoke.result 632share/mysql-test/r/rpl_ignore_revoke.result
587share/mysql-test/r/rpl_ignore_table.result 633share/mysql-test/r/rpl_ignore_table.result
588share/mysql-test/r/rpl_init_slave.result 634share/mysql-test/r/rpl_init_slave.result
589share/mysql-test/r/rpl_innodb.result 635share/mysql-test/r/rpl_innodb.result
590share/mysql-test/r/rpl_insert_delayed.result 636share/mysql-test/r/rpl_insert_delayed.result
591share/mysql-test/r/rpl_insert_id.result 637share/mysql-test/r/rpl_insert_id.result
592share/mysql-test/r/rpl_insert_ignore.result 638share/mysql-test/r/rpl_insert_ignore.result
593share/mysql-test/r/rpl_insert_select.result 639share/mysql-test/r/rpl_insert_select.result
 640share/mysql-test/r/rpl_killed_ddl.result
594share/mysql-test/r/rpl_known_bugs_detection.result 641share/mysql-test/r/rpl_known_bugs_detection.result
595share/mysql-test/r/rpl_loaddata.result 642share/mysql-test/r/rpl_loaddata.result
596share/mysql-test/r/rpl_loaddata_charset.result 643share/mysql-test/r/rpl_loaddata_charset.result
597share/mysql-test/r/rpl_loaddata_map.result 644share/mysql-test/r/rpl_loaddata_map.result
598share/mysql-test/r/rpl_loaddata_rule_m.result 645share/mysql-test/r/rpl_loaddata_rule_m.result
599share/mysql-test/r/rpl_loaddata_rule_s.result 646share/mysql-test/r/rpl_loaddata_rule_s.result
600share/mysql-test/r/rpl_loaddatalocal.result 647share/mysql-test/r/rpl_loaddatalocal.result
601share/mysql-test/r/rpl_locale.result 648share/mysql-test/r/rpl_locale.result
602share/mysql-test/r/rpl_log.result 649share/mysql-test/r/rpl_log.result
603share/mysql-test/r/rpl_log_pos.result 650share/mysql-test/r/rpl_log_pos.result
604share/mysql-test/r/rpl_many_optimize.result 651share/mysql-test/r/rpl_many_optimize.result
605share/mysql-test/r/rpl_master_pos_wait.result 652share/mysql-test/r/rpl_master_pos_wait.result
606share/mysql-test/r/rpl_max_relay_size.result 653share/mysql-test/r/rpl_max_relay_size.result
607share/mysql-test/r/rpl_misc_functions.result 654share/mysql-test/r/rpl_misc_functions.result
608share/mysql-test/r/rpl_multi_delete.result 655share/mysql-test/r/rpl_multi_delete.result
609share/mysql-test/r/rpl_multi_delete2.result 656share/mysql-test/r/rpl_multi_delete2.result
610share/mysql-test/r/rpl_multi_query.result 657share/mysql-test/r/rpl_multi_query.result
611share/mysql-test/r/rpl_multi_update.result 658share/mysql-test/r/rpl_multi_update.result
612share/mysql-test/r/rpl_multi_update2.result 659share/mysql-test/r/rpl_multi_update2.result
613share/mysql-test/r/rpl_multi_update3.result 660share/mysql-test/r/rpl_multi_update3.result
614share/mysql-test/r/rpl_multi_update4.result 661share/mysql-test/r/rpl_multi_update4.result
615share/mysql-test/r/rpl_mystery22.result 662share/mysql-test/r/rpl_mystery22.result
 663share/mysql-test/r/rpl_name_const.result
616share/mysql-test/r/rpl_ndb_innodb_trans.result 664share/mysql-test/r/rpl_ndb_innodb_trans.result
617share/mysql-test/r/rpl_openssl.result 665share/mysql-test/r/rpl_openssl.result
618share/mysql-test/r/rpl_optimize.result 666share/mysql-test/r/rpl_optimize.result
619share/mysql-test/r/rpl_packet.result 667share/mysql-test/r/rpl_packet.result
620share/mysql-test/r/rpl_ps.result 668share/mysql-test/r/rpl_ps.result
621share/mysql-test/r/rpl_redirect.result 669share/mysql-test/r/rpl_redirect.result
622share/mysql-test/r/rpl_relayrotate.result 670share/mysql-test/r/rpl_relayrotate.result
623share/mysql-test/r/rpl_relayspace.result 671share/mysql-test/r/rpl_relayspace.result
624share/mysql-test/r/rpl_replicate_do.result 672share/mysql-test/r/rpl_replicate_do.result
625share/mysql-test/r/rpl_reset_slave.result 673share/mysql-test/r/rpl_reset_slave.result
626share/mysql-test/r/rpl_rewrite_db.result 674share/mysql-test/r/rpl_rewrite_db.result
627share/mysql-test/r/rpl_rotate_logs.result 675share/mysql-test/r/rpl_rotate_logs.result
628share/mysql-test/r/rpl_server_id.result 676share/mysql-test/r/rpl_server_id.result
@@ -631,76 +679,80 @@ share/mysql-test/r/rpl_server_id2.result @@ -631,76 +679,80 @@ share/mysql-test/r/rpl_server_id2.result
631share/mysql-test/r/rpl_session_var.result 679share/mysql-test/r/rpl_session_var.result
632share/mysql-test/r/rpl_set_charset.result 680share/mysql-test/r/rpl_set_charset.result
633share/mysql-test/r/rpl_skip_error.result 681share/mysql-test/r/rpl_skip_error.result
634share/mysql-test/r/rpl_slave_skip.result 682share/mysql-test/r/rpl_slave_skip.result
635share/mysql-test/r/rpl_slave_status.result 683share/mysql-test/r/rpl_slave_status.result
636share/mysql-test/r/rpl_sp.result 684share/mysql-test/r/rpl_sp.result
637share/mysql-test/r/rpl_sp_effects.result 685share/mysql-test/r/rpl_sp_effects.result
638share/mysql-test/r/rpl_sporadic_master.result 686share/mysql-test/r/rpl_sporadic_master.result
639share/mysql-test/r/rpl_ssl.result 687share/mysql-test/r/rpl_ssl.result
640share/mysql-test/r/rpl_start_stop_slave.result 688share/mysql-test/r/rpl_start_stop_slave.result
641share/mysql-test/r/rpl_temporary.result 689share/mysql-test/r/rpl_temporary.result
642share/mysql-test/r/rpl_timezone.result 690share/mysql-test/r/rpl_timezone.result
643share/mysql-test/r/rpl_transaction.result 691share/mysql-test/r/rpl_transaction.result
644share/mysql-test/r/rpl_trigger.result 692share/mysql-test/r/rpl_trigger_not_windows.result
 693share/mysql-test/r/rpl_trigger_windows.result
645share/mysql-test/r/rpl_trunc_temp.result 694share/mysql-test/r/rpl_trunc_temp.result
646share/mysql-test/r/rpl_until.result 695share/mysql-test/r/rpl_until.result
647share/mysql-test/r/rpl_user.result 696share/mysql-test/r/rpl_user.result
648share/mysql-test/r/rpl_user_variables.result 697share/mysql-test/r/rpl_user_variables.result
649share/mysql-test/r/rpl_variables.result 698share/mysql-test/r/rpl_variables.result
650share/mysql-test/r/rpl_view.result 699share/mysql-test/r/rpl_view.result
651share/mysql-test/r/schema.result 700share/mysql-test/r/schema.result
652share/mysql-test/r/select.result 701share/mysql-test/r/select.result
653share/mysql-test/r/select_found.result 702share/mysql-test/r/select_found.result
654share/mysql-test/r/select_safe.result 703share/mysql-test/r/select_safe.result
655share/mysql-test/r/server_id.require 704share/mysql-test/r/server_id.require
656share/mysql-test/r/server_id1.require 705share/mysql-test/r/server_id1.require
657share/mysql-test/r/shm.result 706share/mysql-test/r/shm.result
658share/mysql-test/r/show_check.result 707share/mysql-test/r/show_check.result
659share/mysql-test/r/skip_grants.result 708share/mysql-test/r/skip_grants.result
660share/mysql-test/r/skip_name_resolve.result 709share/mysql-test/r/skip_name_resolve.result
661share/mysql-test/r/slave-running.result 710share/mysql-test/r/slave-running.result
662share/mysql-test/r/slave-stopped.result 711share/mysql-test/r/slave-stopped.result
663share/mysql-test/r/sp-big.result 712share/mysql-test/r/sp-big.result
664share/mysql-test/r/sp-code.result 713share/mysql-test/r/sp-code.result
665share/mysql-test/r/sp-destruct.result 714share/mysql-test/r/sp-destruct.result
666share/mysql-test/r/sp-dynamic.result 715share/mysql-test/r/sp-dynamic.result
667share/mysql-test/r/sp-error.result 716share/mysql-test/r/sp-error.result
 717share/mysql-test/r/sp-fib.result
668share/mysql-test/r/sp-prelocking.result 718share/mysql-test/r/sp-prelocking.result
669share/mysql-test/r/sp-security.result 719share/mysql-test/r/sp-security.result
670share/mysql-test/r/sp-threads.result 720share/mysql-test/r/sp-threads.result
671share/mysql-test/r/sp-ucs2.result 721share/mysql-test/r/sp-ucs2.result
672share/mysql-test/r/sp-vars.result 722share/mysql-test/r/sp-vars.result
673share/mysql-test/r/sp.result 723share/mysql-test/r/sp.result
674share/mysql-test/r/sp_notembedded.result 724share/mysql-test/r/sp_notembedded.result
675share/mysql-test/r/sp_stress_case.result 725share/mysql-test/r/sp_stress_case.result
676share/mysql-test/r/sp_trans.result 726share/mysql-test/r/sp_trans.result
677share/mysql-test/r/sp_trans_log.result 727share/mysql-test/r/sp_trans_log.result
678share/mysql-test/r/sql_mode.result 728share/mysql-test/r/sql_mode.result
679share/mysql-test/r/ssl-big.result 729share/mysql-test/r/ssl-big.result
680share/mysql-test/r/ssl.result 730share/mysql-test/r/ssl.result
681share/mysql-test/r/ssl_8k_key.result 731share/mysql-test/r/ssl_8k_key.result
682share/mysql-test/r/ssl_compress.result 732share/mysql-test/r/ssl_compress.result
683share/mysql-test/r/ssl_connect.result 733share/mysql-test/r/ssl_connect.result
684share/mysql-test/r/status.result 734share/mysql-test/r/status.result
 735share/mysql-test/r/status2.result
685share/mysql-test/r/strict.result 736share/mysql-test/r/strict.result
686share/mysql-test/r/strict_autoinc_1myisam.result 737share/mysql-test/r/strict_autoinc_1myisam.result
687share/mysql-test/r/strict_autoinc_2innodb.result 738share/mysql-test/r/strict_autoinc_2innodb.result
688share/mysql-test/r/strict_autoinc_3heap.result 739share/mysql-test/r/strict_autoinc_3heap.result
689share/mysql-test/r/strict_autoinc_4bdb.result 740share/mysql-test/r/strict_autoinc_4bdb.result
690share/mysql-test/r/strict_autoinc_5ndb.result 741share/mysql-test/r/strict_autoinc_5ndb.result
691share/mysql-test/r/subselect.result 742share/mysql-test/r/subselect.result
692share/mysql-test/r/subselect2.result 743share/mysql-test/r/subselect2.result
693share/mysql-test/r/subselect3.result 744share/mysql-test/r/subselect3.result
 745share/mysql-test/r/subselect4.result
694share/mysql-test/r/subselect_gis.result 746share/mysql-test/r/subselect_gis.result
695share/mysql-test/r/subselect_innodb.result 747share/mysql-test/r/subselect_innodb.result
696share/mysql-test/r/subselect_notembedded.result 748share/mysql-test/r/subselect_notembedded.result
697share/mysql-test/r/sum_distinct-big.result 749share/mysql-test/r/sum_distinct-big.result
698share/mysql-test/r/sum_distinct.result 750share/mysql-test/r/sum_distinct.result
699share/mysql-test/r/symlink.result 751share/mysql-test/r/symlink.result
700share/mysql-test/r/synchronization.result 752share/mysql-test/r/synchronization.result
701share/mysql-test/r/sysdate_is_now.result 753share/mysql-test/r/sysdate_is_now.result
702share/mysql-test/r/system_mysql_db.result 754share/mysql-test/r/system_mysql_db.result
703share/mysql-test/r/system_mysql_db_refs.result 755share/mysql-test/r/system_mysql_db_refs.result
704share/mysql-test/r/tablelock.result 756share/mysql-test/r/tablelock.result
705share/mysql-test/r/temp_table.result 757share/mysql-test/r/temp_table.result
706share/mysql-test/r/testdb_only.require 758share/mysql-test/r/testdb_only.require
@@ -744,26 +796,27 @@ share/mysql-test/r/user_var.result @@ -744,26 +796,27 @@ share/mysql-test/r/user_var.result
744share/mysql-test/r/varbinary.result 796share/mysql-test/r/varbinary.result
745share/mysql-test/r/variables-big.result 797share/mysql-test/r/variables-big.result
746share/mysql-test/r/variables.result 798share/mysql-test/r/variables.result
747share/mysql-test/r/view.result 799share/mysql-test/r/view.result
748share/mysql-test/r/view_grant.result 800share/mysql-test/r/view_grant.result
749share/mysql-test/r/wait_timeout.result 801share/mysql-test/r/wait_timeout.result
750share/mysql-test/r/warnings.result 802share/mysql-test/r/warnings.result
751share/mysql-test/r/windows.result 803share/mysql-test/r/windows.result
752share/mysql-test/r/xa.result 804share/mysql-test/r/xa.result
753share/mysql-test/std_data/14897.frm 805share/mysql-test/std_data/14897.frm
754share/mysql-test/std_data/Index.xml 806share/mysql-test/std_data/Index.xml
755share/mysql-test/std_data/Moscow_leap 807share/mysql-test/std_data/Moscow_leap
756share/mysql-test/std_data/bad_gis_data.dat 808share/mysql-test/std_data/bad_gis_data.dat
 809share/mysql-test/std_data/binlog_transaction.000001
757share/mysql-test/std_data/bug15328.cnf 810share/mysql-test/std_data/bug15328.cnf
758share/mysql-test/std_data/bug16266.000001 811share/mysql-test/std_data/bug16266.000001
759share/mysql-test/std_data/bug19371.MYD 812share/mysql-test/std_data/bug19371.MYD
760share/mysql-test/std_data/bug19371.MYI 813share/mysql-test/std_data/bug19371.MYI
761share/mysql-test/std_data/bug19371.frm 814share/mysql-test/std_data/bug19371.frm
762share/mysql-test/std_data/bug35469.dat 815share/mysql-test/std_data/bug35469.dat
763share/mysql-test/std_data/bug36055.MYD 816share/mysql-test/std_data/bug36055.MYD
764share/mysql-test/std_data/bug36055.MYI 817share/mysql-test/std_data/bug36055.MYI
765share/mysql-test/std_data/bug36055.frm 818share/mysql-test/std_data/bug36055.frm
766share/mysql-test/std_data/cacert.pem 819share/mysql-test/std_data/cacert.pem
767share/mysql-test/std_data/client-cert.pem 820share/mysql-test/std_data/client-cert.pem
768share/mysql-test/std_data/client-key.pem 821share/mysql-test/std_data/client-key.pem
769share/mysql-test/std_data/des_key_file 822share/mysql-test/std_data/des_key_file
@@ -783,62 +836,60 @@ share/mysql-test/std_data/funcs_1/myisam @@ -783,62 +836,60 @@ share/mysql-test/std_data/funcs_1/myisam
783share/mysql-test/std_data/funcs_1/t3.txt 836share/mysql-test/std_data/funcs_1/t3.txt
784share/mysql-test/std_data/funcs_1/t4.txt 837share/mysql-test/std_data/funcs_1/t4.txt
785share/mysql-test/std_data/funcs_1/t7.txt 838share/mysql-test/std_data/funcs_1/t7.txt
786share/mysql-test/std_data/funcs_1/t9.txt 839share/mysql-test/std_data/funcs_1/t9.txt
787share/mysql-test/std_data/init_file.dat 840share/mysql-test/std_data/init_file.dat
788share/mysql-test/std_data/loaddata1.dat 841share/mysql-test/std_data/loaddata1.dat
789share/mysql-test/std_data/loaddata2.dat 842share/mysql-test/std_data/loaddata2.dat
790share/mysql-test/std_data/loaddata3.dat 843share/mysql-test/std_data/loaddata3.dat
791share/mysql-test/std_data/loaddata4.dat 844share/mysql-test/std_data/loaddata4.dat
792share/mysql-test/std_data/loaddata5.dat 845share/mysql-test/std_data/loaddata5.dat
793share/mysql-test/std_data/loaddata6.dat 846share/mysql-test/std_data/loaddata6.dat
794share/mysql-test/std_data/loaddata_dq.dat 847share/mysql-test/std_data/loaddata_dq.dat
795share/mysql-test/std_data/loaddata_pair.dat 848share/mysql-test/std_data/loaddata_pair.dat
 849share/mysql-test/std_data/loaddata_utf8.dat
796share/mysql-test/std_data/master-bin.000001 850share/mysql-test/std_data/master-bin.000001
797share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data 851share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data
798share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data 852share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
799share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl 853share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl
800share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log 854share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log
801share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl 855share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl
802share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log 856share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log
803share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data 857share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data
804share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data 858share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data
805share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl 859share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl
806share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log 860share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log
807share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl 861share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl
808share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log 862share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log
809share/mysql-test/std_data/ndb_config_mycnf1.cnf 863share/mysql-test/std_data/ndb_config_mycnf1.cnf
810share/mysql-test/std_data/ndb_config_mycnf2.cnf 864share/mysql-test/std_data/ndb_config_mycnf2.cnf
811share/mysql-test/std_data/rpl_loaddata.dat 865share/mysql-test/std_data/rpl_loaddata.dat
812share/mysql-test/std_data/rpl_loaddata2.dat 866share/mysql-test/std_data/rpl_loaddata2.dat
813share/mysql-test/std_data/rpl_timezone.dat 867share/mysql-test/std_data/rpl_timezone.dat
814share/mysql-test/std_data/server-cert-des.pem 
815share/mysql-test/std_data/server-cert.pem 868share/mysql-test/std_data/server-cert.pem
816share/mysql-test/std_data/server-key-des.pem 
817share/mysql-test/std_data/server-key.pem 869share/mysql-test/std_data/server-key.pem
818share/mysql-test/std_data/server8k-cert.pem 870share/mysql-test/std_data/server8k-cert.pem
819share/mysql-test/std_data/server8k-key.pem 871share/mysql-test/std_data/server8k-key.pem
820share/mysql-test/std_data/trunc_binlog.000001 872share/mysql-test/std_data/trunc_binlog.000001
821share/mysql-test/std_data/untrusted-cacert.pem 873share/mysql-test/std_data/untrusted-cacert.pem
822share/mysql-test/std_data/vchar.frm 874share/mysql-test/std_data/vchar.frm
823share/mysql-test/std_data/warnings_loaddata.dat 875share/mysql-test/std_data/warnings_loaddata.dat
824share/mysql-test/std_data/words.dat 876share/mysql-test/std_data/words.dat
825share/mysql-test/suite/funcs_1/README.txt 877share/mysql-test/suite/funcs_1/README.txt
826share/mysql-test/suite/funcs_1/bitdata/bitdata_master.test 878share/mysql-test/suite/funcs_1/bitdata/bitdata_master.test
827share/mysql-test/suite/funcs_1/cursors/cursors_master.test 879share/mysql-test/suite/funcs_1/cursors/cursors_master.test
828share/mysql-test/suite/funcs_1/datadict/basics_mixed1.inc 880share/mysql-test/suite/funcs_1/datadict/basics_mixed1.inc
829share/mysql-test/suite/funcs_1/datadict/basics_mixed2.inc 881share/mysql-test/suite/funcs_1/datadict/basics_mixed2.inc
830share/mysql-test/suite/funcs_1/datadict/basics_mixed3.inc 882share/mysql-test/suite/funcs_1/datadict/basics_mixed3.inc
831share/mysql-test/suite/funcs_1/datadict/charset_collation.inc 
832share/mysql-test/suite/funcs_1/datadict/columns.inc 883share/mysql-test/suite/funcs_1/datadict/columns.inc
833share/mysql-test/suite/funcs_1/datadict/datadict.pre 884share/mysql-test/suite/funcs_1/datadict/datadict.pre
834share/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc 885share/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
835share/mysql-test/suite/funcs_1/datadict/datadict_load.inc 886share/mysql-test/suite/funcs_1/datadict/datadict_load.inc
836share/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc 887share/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
837share/mysql-test/suite/funcs_1/datadict/is_routines.inc 888share/mysql-test/suite/funcs_1/datadict/is_routines.inc
838share/mysql-test/suite/funcs_1/datadict/is_schemata.inc 889share/mysql-test/suite/funcs_1/datadict/is_schemata.inc
839share/mysql-test/suite/funcs_1/datadict/is_table_query.inc 890share/mysql-test/suite/funcs_1/datadict/is_table_query.inc
840share/mysql-test/suite/funcs_1/datadict/is_tables.inc 891share/mysql-test/suite/funcs_1/datadict/is_tables.inc
841share/mysql-test/suite/funcs_1/datadict/is_triggers.inc 892share/mysql-test/suite/funcs_1/datadict/is_triggers.inc
842share/mysql-test/suite/funcs_1/datadict/is_views.inc 893share/mysql-test/suite/funcs_1/datadict/is_views.inc
843share/mysql-test/suite/funcs_1/datadict/statistics.inc 894share/mysql-test/suite/funcs_1/datadict/statistics.inc
844share/mysql-test/suite/funcs_1/datadict/table_constraints.inc 895share/mysql-test/suite/funcs_1/datadict/table_constraints.inc
@@ -854,54 +905,52 @@ share/mysql-test/suite/funcs_1/include/i @@ -854,54 +905,52 @@ share/mysql-test/suite/funcs_1/include/i
854share/mysql-test/suite/funcs_1/include/memory_tb1.inc 905share/mysql-test/suite/funcs_1/include/memory_tb1.inc
855share/mysql-test/suite/funcs_1/include/memory_tb2.inc 906share/mysql-test/suite/funcs_1/include/memory_tb2.inc
856share/mysql-test/suite/funcs_1/include/memory_tb3.inc 907share/mysql-test/suite/funcs_1/include/memory_tb3.inc
857share/mysql-test/suite/funcs_1/include/memory_tb4.inc 908share/mysql-test/suite/funcs_1/include/memory_tb4.inc
858share/mysql-test/suite/funcs_1/include/myisam_tb1.inc 909share/mysql-test/suite/funcs_1/include/myisam_tb1.inc
859share/mysql-test/suite/funcs_1/include/myisam_tb2.inc 910share/mysql-test/suite/funcs_1/include/myisam_tb2.inc
860share/mysql-test/suite/funcs_1/include/myisam_tb3.inc 911share/mysql-test/suite/funcs_1/include/myisam_tb3.inc
861share/mysql-test/suite/funcs_1/include/myisam_tb4.inc 912share/mysql-test/suite/funcs_1/include/myisam_tb4.inc
862share/mysql-test/suite/funcs_1/include/show_connection.inc 913share/mysql-test/suite/funcs_1/include/show_connection.inc
863share/mysql-test/suite/funcs_1/include/sp_tb.inc 914share/mysql-test/suite/funcs_1/include/sp_tb.inc
864share/mysql-test/suite/funcs_1/include/tb3.inc 915share/mysql-test/suite/funcs_1/include/tb3.inc
865share/mysql-test/suite/funcs_1/lib/DataGen_local.pl 916share/mysql-test/suite/funcs_1/lib/DataGen_local.pl
866share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl 917share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
867share/mysql-test/suite/funcs_1/r/charset_collation_1.result 918share/mysql-test/suite/funcs_1/r/charset_collation.result
868share/mysql-test/suite/funcs_1/r/charset_collation_2.result 
869share/mysql-test/suite/funcs_1/r/charset_collation_3.result 
870share/mysql-test/suite/funcs_1/r/innodb_bitdata.result 919share/mysql-test/suite/funcs_1/r/innodb_bitdata.result
871share/mysql-test/suite/funcs_1/r/innodb_cursors.result 920share/mysql-test/suite/funcs_1/r/innodb_cursors.result
872share/mysql-test/suite/funcs_1/r/innodb_func_view.result 921share/mysql-test/suite/funcs_1/r/innodb_func_view.result
873share/mysql-test/suite/funcs_1/r/innodb_storedproc.result 922share/mysql-test/suite/funcs_1/r/innodb_storedproc.result
874share/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result 923share/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
875share/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result 924share/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
876share/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result 925share/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
877share/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result 926share/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
878share/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result 927share/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
879share/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result 928share/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
880share/mysql-test/suite/funcs_1/r/innodb_trig_0102.result 929share/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
881share/mysql-test/suite/funcs_1/r/innodb_trig_03.result 930share/mysql-test/suite/funcs_1/r/innodb_trig_03.result
882share/mysql-test/suite/funcs_1/r/innodb_trig_0407.result 931share/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
883share/mysql-test/suite/funcs_1/r/innodb_trig_08.result 932share/mysql-test/suite/funcs_1/r/innodb_trig_08.result
884share/mysql-test/suite/funcs_1/r/innodb_trig_09.result 933share/mysql-test/suite/funcs_1/r/innodb_trig_09.result
885share/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result 934share/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
886share/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result 935share/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
887share/mysql-test/suite/funcs_1/r/innodb_views.result 936share/mysql-test/suite/funcs_1/r/innodb_views.result
888share/mysql-test/suite/funcs_1/r/is_basics_mixed.result 937share/mysql-test/suite/funcs_1/r/is_basics_mixed.result
889share/mysql-test/suite/funcs_1/r/is_character_sets.result 938share/mysql-test/suite/funcs_1/r/is_character_sets.result
890share/mysql-test/suite/funcs_1/r/is_cml_innodb.result 939share/mysql-test/suite/funcs_1/r/is_cml_innodb.result
891share/mysql-test/suite/funcs_1/r/is_cml_memory.result 940share/mysql-test/suite/funcs_1/r/is_cml_memory.result
892share/mysql-test/suite/funcs_1/r/is_cml_myisam.result 941share/mysql-test/suite/funcs_1/r/is_cml_myisam.result
893share/mysql-test/suite/funcs_1/r/is_cml_ndb.result 942share/mysql-test/suite/funcs_1/r/is_cml_ndb.result
894share/mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result 943share/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
895share/mysql-test/suite/funcs_1/r/is_collations.result 944share/mysql-test/suite/funcs_1/r/is_collations.result
896share/mysql-test/suite/funcs_1/r/is_column_privileges.result 945share/mysql-test/suite/funcs_1/r/is_column_privileges.result
897share/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result 946share/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result
898share/mysql-test/suite/funcs_1/r/is_columns.result 947share/mysql-test/suite/funcs_1/r/is_columns.result
899share/mysql-test/suite/funcs_1/r/is_columns_innodb.result 948share/mysql-test/suite/funcs_1/r/is_columns_innodb.result
900share/mysql-test/suite/funcs_1/r/is_columns_is.result 949share/mysql-test/suite/funcs_1/r/is_columns_is.result
901share/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result 950share/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
902share/mysql-test/suite/funcs_1/r/is_columns_memory.result 951share/mysql-test/suite/funcs_1/r/is_columns_memory.result
903share/mysql-test/suite/funcs_1/r/is_columns_myisam.result 952share/mysql-test/suite/funcs_1/r/is_columns_myisam.result
904share/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result 953share/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
905share/mysql-test/suite/funcs_1/r/is_columns_mysql.result 954share/mysql-test/suite/funcs_1/r/is_columns_mysql.result
906share/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result 955share/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
907share/mysql-test/suite/funcs_1/r/is_columns_ndb.result 956share/mysql-test/suite/funcs_1/r/is_columns_ndb.result
@@ -978,55 +1027,53 @@ share/mysql-test/suite/funcs_1/r/ndb_tri @@ -978,55 +1027,53 @@ share/mysql-test/suite/funcs_1/r/ndb_tri
978share/mysql-test/suite/funcs_1/r/ndb_trig_08.result 1027share/mysql-test/suite/funcs_1/r/ndb_trig_08.result
979share/mysql-test/suite/funcs_1/r/ndb_trig_09.result 1028share/mysql-test/suite/funcs_1/r/ndb_trig_09.result
980share/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result 1029share/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
981share/mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc 1030share/mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
982share/mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc 1031share/mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
983share/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc 1032share/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
984share/mysql-test/suite/funcs_1/storedproc/storedproc_03.inc 1033share/mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
985share/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc 1034share/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
986share/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc 1035share/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
987share/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc 1036share/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
988share/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc 1037share/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
989share/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc 1038share/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
990share/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc 1039share/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
991share/mysql-test/suite/funcs_1/t/charset_collation_1.test 1040share/mysql-test/suite/funcs_1/t/charset_collation.test
992share/mysql-test/suite/funcs_1/t/charset_collation_2.test 
993share/mysql-test/suite/funcs_1/t/charset_collation_3.test 
994share/mysql-test/suite/funcs_1/t/disabled.def 1041share/mysql-test/suite/funcs_1/t/disabled.def
995share/mysql-test/suite/funcs_1/t/innodb_bitdata.test 1042share/mysql-test/suite/funcs_1/t/innodb_bitdata.test
996share/mysql-test/suite/funcs_1/t/innodb_cursors.test 1043share/mysql-test/suite/funcs_1/t/innodb_cursors.test
997share/mysql-test/suite/funcs_1/t/innodb_func_view.test 1044share/mysql-test/suite/funcs_1/t/innodb_func_view.test
998share/mysql-test/suite/funcs_1/t/innodb_storedproc.test 1045share/mysql-test/suite/funcs_1/t/innodb_storedproc.test
999share/mysql-test/suite/funcs_1/t/innodb_storedproc_02.test 1046share/mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
1000share/mysql-test/suite/funcs_1/t/innodb_storedproc_03.test 1047share/mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
1001share/mysql-test/suite/funcs_1/t/innodb_storedproc_06.test 1048share/mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
1002share/mysql-test/suite/funcs_1/t/innodb_storedproc_07.test 1049share/mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
1003share/mysql-test/suite/funcs_1/t/innodb_storedproc_08.test 1050share/mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
1004share/mysql-test/suite/funcs_1/t/innodb_storedproc_10.test 1051share/mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
1005share/mysql-test/suite/funcs_1/t/innodb_trig_0102.test 1052share/mysql-test/suite/funcs_1/t/innodb_trig_0102.test
1006share/mysql-test/suite/funcs_1/t/innodb_trig_03.test 1053share/mysql-test/suite/funcs_1/t/innodb_trig_03.test
1007share/mysql-test/suite/funcs_1/t/innodb_trig_0407.test 1054share/mysql-test/suite/funcs_1/t/innodb_trig_0407.test
1008share/mysql-test/suite/funcs_1/t/innodb_trig_08.test 1055share/mysql-test/suite/funcs_1/t/innodb_trig_08.test
1009share/mysql-test/suite/funcs_1/t/innodb_trig_09.test 1056share/mysql-test/suite/funcs_1/t/innodb_trig_09.test
1010share/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test 1057share/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
1011share/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test 1058share/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
1012share/mysql-test/suite/funcs_1/t/innodb_views.test 1059share/mysql-test/suite/funcs_1/t/innodb_views.test
1013share/mysql-test/suite/funcs_1/t/is_basics_mixed.test 1060share/mysql-test/suite/funcs_1/t/is_basics_mixed.test
1014share/mysql-test/suite/funcs_1/t/is_character_sets.test 1061share/mysql-test/suite/funcs_1/t/is_character_sets.test
1015share/mysql-test/suite/funcs_1/t/is_cml_innodb.test 1062share/mysql-test/suite/funcs_1/t/is_cml_innodb.test
1016share/mysql-test/suite/funcs_1/t/is_cml_memory.test 1063share/mysql-test/suite/funcs_1/t/is_cml_memory.test
1017share/mysql-test/suite/funcs_1/t/is_cml_myisam.test 1064share/mysql-test/suite/funcs_1/t/is_cml_myisam.test
1018share/mysql-test/suite/funcs_1/t/is_cml_ndb.test 1065share/mysql-test/suite/funcs_1/t/is_cml_ndb.test
1019share/mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test 1066share/mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
1020share/mysql-test/suite/funcs_1/t/is_collations.test 1067share/mysql-test/suite/funcs_1/t/is_collations.test
1021share/mysql-test/suite/funcs_1/t/is_column_privileges.test 1068share/mysql-test/suite/funcs_1/t/is_column_privileges.test
1022share/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test 1069share/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
1023share/mysql-test/suite/funcs_1/t/is_columns.test 1070share/mysql-test/suite/funcs_1/t/is_columns.test
1024share/mysql-test/suite/funcs_1/t/is_columns_innodb.test 1071share/mysql-test/suite/funcs_1/t/is_columns_innodb.test
1025share/mysql-test/suite/funcs_1/t/is_columns_is.test 1072share/mysql-test/suite/funcs_1/t/is_columns_is.test
1026share/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test 1073share/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
1027share/mysql-test/suite/funcs_1/t/is_columns_memory.test 1074share/mysql-test/suite/funcs_1/t/is_columns_memory.test
1028share/mysql-test/suite/funcs_1/t/is_columns_myisam.test 1075share/mysql-test/suite/funcs_1/t/is_columns_myisam.test
1029share/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test 1076share/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
1030share/mysql-test/suite/funcs_1/t/is_columns_mysql.test 1077share/mysql-test/suite/funcs_1/t/is_columns_mysql.test
1031share/mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test 1078share/mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
1032share/mysql-test/suite/funcs_1/t/is_columns_ndb.test 1079share/mysql-test/suite/funcs_1/t/is_columns_ndb.test
@@ -1402,26 +1449,32 @@ share/mysql-test/t/bench_count_distinct. @@ -1402,26 +1449,32 @@ share/mysql-test/t/bench_count_distinct.
1402share/mysql-test/t/bigint.test 1449share/mysql-test/t/bigint.test
1403share/mysql-test/t/binary.test 1450share/mysql-test/t/binary.test
1404share/mysql-test/t/binlog-master.opt 1451share/mysql-test/t/binlog-master.opt
1405share/mysql-test/t/binlog.test 1452share/mysql-test/t/binlog.test
1406share/mysql-test/t/binlog_index.test 1453share/mysql-test/t/binlog_index.test
1407share/mysql-test/t/binlog_innodb.test 1454share/mysql-test/t/binlog_innodb.test
1408share/mysql-test/t/binlog_killed.test 1455share/mysql-test/t/binlog_killed.test
1409share/mysql-test/t/binlog_killed_simulate-master.opt 1456share/mysql-test/t/binlog_killed_simulate-master.opt
1410share/mysql-test/t/binlog_killed_simulate.test 1457share/mysql-test/t/binlog_killed_simulate.test
1411share/mysql-test/t/binlog_start_comment.test 1458share/mysql-test/t/binlog_start_comment.test
1412share/mysql-test/t/blackhole.test 1459share/mysql-test/t/blackhole.test
1413share/mysql-test/t/bool.test 1460share/mysql-test/t/bool.test
1414share/mysql-test/t/bootstrap.test 1461share/mysql-test/t/bootstrap.test
 1462share/mysql-test/t/bug40113-master.opt
 1463share/mysql-test/t/bug40113.test
 1464share/mysql-test/t/bug41756-master.opt
 1465share/mysql-test/t/bug41756.test
 1466share/mysql-test/t/bug46080-master.opt
 1467share/mysql-test/t/bug46080.test
1415share/mysql-test/t/bulk_replace.test 1468share/mysql-test/t/bulk_replace.test
1416share/mysql-test/t/case.test 1469share/mysql-test/t/case.test
1417share/mysql-test/t/cast.test 1470share/mysql-test/t/cast.test
1418share/mysql-test/t/check.test 1471share/mysql-test/t/check.test
1419share/mysql-test/t/client_xml.test 1472share/mysql-test/t/client_xml.test
1420share/mysql-test/t/comments.test 1473share/mysql-test/t/comments.test
1421share/mysql-test/t/compare.test 1474share/mysql-test/t/compare.test
1422share/mysql-test/t/compress.test 1475share/mysql-test/t/compress.test
1423share/mysql-test/t/connect.test 1476share/mysql-test/t/connect.test
1424share/mysql-test/t/consistent_snapshot.test 1477share/mysql-test/t/consistent_snapshot.test
1425share/mysql-test/t/constraints.test 1478share/mysql-test/t/constraints.test
1426share/mysql-test/t/count_distinct.test 1479share/mysql-test/t/count_distinct.test
1427share/mysql-test/t/count_distinct2-master.opt 1480share/mysql-test/t/count_distinct2-master.opt
@@ -1431,26 +1484,28 @@ share/mysql-test/t/create.test @@ -1431,26 +1484,28 @@ share/mysql-test/t/create.test
1431share/mysql-test/t/create_not_windows.test 1484share/mysql-test/t/create_not_windows.test
1432share/mysql-test/t/create_select_tmp.test 1485share/mysql-test/t/create_select_tmp.test
1433share/mysql-test/t/csv.test 1486share/mysql-test/t/csv.test
1434share/mysql-test/t/ctype_ascii.test 1487share/mysql-test/t/ctype_ascii.test
1435share/mysql-test/t/ctype_big5.test 1488share/mysql-test/t/ctype_big5.test
1436share/mysql-test/t/ctype_collate.test 1489share/mysql-test/t/ctype_collate.test
1437share/mysql-test/t/ctype_cp1250_ch.test 1490share/mysql-test/t/ctype_cp1250_ch.test
1438share/mysql-test/t/ctype_cp1251.test 1491share/mysql-test/t/ctype_cp1251.test
1439share/mysql-test/t/ctype_cp932.test 1492share/mysql-test/t/ctype_cp932.test
1440share/mysql-test/t/ctype_cp932_binlog.test 1493share/mysql-test/t/ctype_cp932_binlog.test
1441share/mysql-test/t/ctype_create.test 1494share/mysql-test/t/ctype_create.test
1442share/mysql-test/t/ctype_eucjpms.test 1495share/mysql-test/t/ctype_eucjpms.test
1443share/mysql-test/t/ctype_euckr.test 1496share/mysql-test/t/ctype_euckr.test
 1497share/mysql-test/t/ctype_filesystem-master.opt
 1498share/mysql-test/t/ctype_filesystem.test
1444share/mysql-test/t/ctype_gb2312.test 1499share/mysql-test/t/ctype_gb2312.test
1445share/mysql-test/t/ctype_gbk.test 1500share/mysql-test/t/ctype_gbk.test
1446share/mysql-test/t/ctype_hebrew.test 1501share/mysql-test/t/ctype_hebrew.test
1447share/mysql-test/t/ctype_latin1.test 1502share/mysql-test/t/ctype_latin1.test
1448share/mysql-test/t/ctype_latin1_de-master.opt 1503share/mysql-test/t/ctype_latin1_de-master.opt
1449share/mysql-test/t/ctype_latin1_de.test 1504share/mysql-test/t/ctype_latin1_de.test
1450share/mysql-test/t/ctype_latin2.test 1505share/mysql-test/t/ctype_latin2.test
1451share/mysql-test/t/ctype_latin2_ch.test 1506share/mysql-test/t/ctype_latin2_ch.test
1452share/mysql-test/t/ctype_ldml-master.opt 1507share/mysql-test/t/ctype_ldml-master.opt
1453share/mysql-test/t/ctype_ldml.test 1508share/mysql-test/t/ctype_ldml.test
1454share/mysql-test/t/ctype_many.test 1509share/mysql-test/t/ctype_many.test
1455share/mysql-test/t/ctype_mb.test 1510share/mysql-test/t/ctype_mb.test
1456share/mysql-test/t/ctype_recoding.test 1511share/mysql-test/t/ctype_recoding.test
@@ -1476,26 +1531,28 @@ share/mysql-test/t/drop.test @@ -1476,26 +1531,28 @@ share/mysql-test/t/drop.test
1476share/mysql-test/t/drop_temp_table.test 1531share/mysql-test/t/drop_temp_table.test
1477share/mysql-test/t/empty_table.test 1532share/mysql-test/t/empty_table.test
1478share/mysql-test/t/endspace.test 1533share/mysql-test/t/endspace.test
1479share/mysql-test/t/error_simulation-master.opt 1534share/mysql-test/t/error_simulation-master.opt
1480share/mysql-test/t/error_simulation.test 1535share/mysql-test/t/error_simulation.test
1481share/mysql-test/t/errors.test 1536share/mysql-test/t/errors.test
1482share/mysql-test/t/exampledb.test 1537share/mysql-test/t/exampledb.test
1483share/mysql-test/t/execution_constants.test 1538share/mysql-test/t/execution_constants.test
1484share/mysql-test/t/explain.test 1539share/mysql-test/t/explain.test
1485share/mysql-test/t/federated.test 1540share/mysql-test/t/federated.test
1486share/mysql-test/t/federated_archive.test 1541share/mysql-test/t/federated_archive.test
1487share/mysql-test/t/federated_bug_13118.test 1542share/mysql-test/t/federated_bug_13118.test
1488share/mysql-test/t/federated_bug_25714.test 1543share/mysql-test/t/federated_bug_25714.test
 1544share/mysql-test/t/federated_debug-master.opt
 1545share/mysql-test/t/federated_debug.test
1489share/mysql-test/t/federated_disabled-master.opt 1546share/mysql-test/t/federated_disabled-master.opt
1490share/mysql-test/t/federated_disabled.test 1547share/mysql-test/t/federated_disabled.test
1491share/mysql-test/t/federated_innodb-slave.opt 1548share/mysql-test/t/federated_innodb-slave.opt
1492share/mysql-test/t/federated_innodb.test 1549share/mysql-test/t/federated_innodb.test
1493share/mysql-test/t/fix_priv_tables.test 1550share/mysql-test/t/fix_priv_tables.test
1494share/mysql-test/t/flush.test 1551share/mysql-test/t/flush.test
1495share/mysql-test/t/flush2-master.opt 1552share/mysql-test/t/flush2-master.opt
1496share/mysql-test/t/flush2.test 1553share/mysql-test/t/flush2.test
1497share/mysql-test/t/flush_block_commit.test 1554share/mysql-test/t/flush_block_commit.test
1498share/mysql-test/t/flush_block_commit_notembedded.test 1555share/mysql-test/t/flush_block_commit_notembedded.test
1499share/mysql-test/t/flush_read_lock_kill-master.opt 1556share/mysql-test/t/flush_read_lock_kill-master.opt
1500share/mysql-test/t/flush_read_lock_kill.test 1557share/mysql-test/t/flush_read_lock_kill.test
1501share/mysql-test/t/flush_table.test 1558share/mysql-test/t/flush_table.test
@@ -1535,65 +1592,71 @@ share/mysql-test/t/func_set.test @@ -1535,65 +1592,71 @@ share/mysql-test/t/func_set.test
1535share/mysql-test/t/func_str.test 1592share/mysql-test/t/func_str.test
1536share/mysql-test/t/func_system.test 1593share/mysql-test/t/func_system.test
1537share/mysql-test/t/func_test.test 1594share/mysql-test/t/func_test.test
1538share/mysql-test/t/func_time.test 1595share/mysql-test/t/func_time.test
1539share/mysql-test/t/func_timestamp.test 1596share/mysql-test/t/func_timestamp.test
1540share/mysql-test/t/gcc296.test 1597share/mysql-test/t/gcc296.test
1541share/mysql-test/t/gis-rtree.test 1598share/mysql-test/t/gis-rtree.test
1542share/mysql-test/t/gis.test 1599share/mysql-test/t/gis.test
1543share/mysql-test/t/grant.test 1600share/mysql-test/t/grant.test
1544share/mysql-test/t/grant2.test 1601share/mysql-test/t/grant2.test
1545share/mysql-test/t/grant3-master.opt 1602share/mysql-test/t/grant3-master.opt
1546share/mysql-test/t/grant3.test 1603share/mysql-test/t/grant3.test
1547share/mysql-test/t/grant_cache.test 1604share/mysql-test/t/grant_cache.test
 1605share/mysql-test/t/grant_lowercase_fs.test
1548share/mysql-test/t/greedy_optimizer.test 1606share/mysql-test/t/greedy_optimizer.test
1549share/mysql-test/t/group_by.test 1607share/mysql-test/t/group_by.test
1550share/mysql-test/t/group_min_max.test 1608share/mysql-test/t/group_min_max.test
1551share/mysql-test/t/handler.test 1609share/mysql-test/t/handler.test
1552share/mysql-test/t/having.test 1610share/mysql-test/t/having.test
1553share/mysql-test/t/heap.test 1611share/mysql-test/t/heap.test
1554share/mysql-test/t/heap_auto_increment.test 1612share/mysql-test/t/heap_auto_increment.test
1555share/mysql-test/t/heap_btree.test 1613share/mysql-test/t/heap_btree.test
1556share/mysql-test/t/heap_hash.test 1614share/mysql-test/t/heap_hash.test
1557share/mysql-test/t/help.test 1615share/mysql-test/t/help.test
1558share/mysql-test/t/im_daemon_life_cycle-im.opt 1616share/mysql-test/t/im_daemon_life_cycle-im.opt
1559share/mysql-test/t/im_daemon_life_cycle.imtest 1617share/mysql-test/t/im_daemon_life_cycle.imtest
1560share/mysql-test/t/im_life_cycle-im.opt 1618share/mysql-test/t/im_life_cycle-im.opt
1561share/mysql-test/t/im_life_cycle.imtest 1619share/mysql-test/t/im_life_cycle.imtest
1562share/mysql-test/t/im_options_set.imtest 1620share/mysql-test/t/im_options_set.imtest
1563share/mysql-test/t/im_options_unset.imtest 1621share/mysql-test/t/im_options_unset.imtest
1564share/mysql-test/t/im_utils-im.opt 1622share/mysql-test/t/im_utils-im.opt
1565share/mysql-test/t/im_utils.imtest 1623share/mysql-test/t/im_utils.imtest
1566share/mysql-test/t/index_merge.test 1624share/mysql-test/t/index_merge.test
1567share/mysql-test/t/index_merge_bdb.test 1625share/mysql-test/t/index_merge_bdb.test
1568share/mysql-test/t/index_merge_innodb.test 1626share/mysql-test/t/index_merge_innodb.test
1569share/mysql-test/t/index_merge_innodb2.test 1627share/mysql-test/t/index_merge_innodb2.test
1570share/mysql-test/t/index_merge_ror.test 1628share/mysql-test/t/index_merge_ror.test
1571share/mysql-test/t/index_merge_ror_cpk.test 1629share/mysql-test/t/index_merge_ror_cpk.test
1572share/mysql-test/t/information_schema.test 1630share/mysql-test/t/information_schema.test
1573share/mysql-test/t/information_schema_chmod.test 1631share/mysql-test/t/information_schema_chmod.test
 1632share/mysql-test/t/information_schema_community.test
1574share/mysql-test/t/information_schema_db.test 1633share/mysql-test/t/information_schema_db.test
1575share/mysql-test/t/information_schema_inno.test 1634share/mysql-test/t/information_schema_inno.test
1576share/mysql-test/t/init_connect-master.opt 1635share/mysql-test/t/init_connect-master.opt
1577share/mysql-test/t/init_connect.test 1636share/mysql-test/t/init_connect.test
1578share/mysql-test/t/init_file-master.opt 1637share/mysql-test/t/init_file-master.opt
1579share/mysql-test/t/init_file.test 1638share/mysql-test/t/init_file.test
 1639share/mysql-test/t/innodb-autoinc-optimize.test
1580share/mysql-test/t/innodb-big.test 1640share/mysql-test/t/innodb-big.test
1581share/mysql-test/t/innodb-deadlock.test 1641share/mysql-test/t/innodb-deadlock.test
1582share/mysql-test/t/innodb-lock.test 1642share/mysql-test/t/innodb-lock.test
1583share/mysql-test/t/innodb-master.opt 1643share/mysql-test/t/innodb-master.opt
1584share/mysql-test/t/innodb-replace.test 1644share/mysql-test/t/innodb-replace.test
1585share/mysql-test/t/innodb-ucs2.test 1645share/mysql-test/t/innodb-ucs2.test
1586share/mysql-test/t/innodb.test 1646share/mysql-test/t/innodb.test
 1647share/mysql-test/t/innodb_bug35220.test
 1648share/mysql-test/t/innodb_bug40565.test
 1649share/mysql-test/t/innodb_bug42419.test
1587share/mysql-test/t/innodb_cache-master.opt 1650share/mysql-test/t/innodb_cache-master.opt
1588share/mysql-test/t/innodb_cache.test 1651share/mysql-test/t/innodb_cache.test
1589share/mysql-test/t/innodb_gis.test 1652share/mysql-test/t/innodb_gis.test
1590share/mysql-test/t/innodb_handler.test 1653share/mysql-test/t/innodb_handler.test
1591share/mysql-test/t/innodb_mysql-master.opt 1654share/mysql-test/t/innodb_mysql-master.opt
1592share/mysql-test/t/innodb_mysql.test 1655share/mysql-test/t/innodb_mysql.test
1593share/mysql-test/t/innodb_notembedded.test 1656share/mysql-test/t/innodb_notembedded.test
1594share/mysql-test/t/innodb_timeout_rollback-master.opt 1657share/mysql-test/t/innodb_timeout_rollback-master.opt
1595share/mysql-test/t/innodb_timeout_rollback.test 1658share/mysql-test/t/innodb_timeout_rollback.test
1596share/mysql-test/t/innodb_unsafe_binlog-master.opt 1659share/mysql-test/t/innodb_unsafe_binlog-master.opt
1597share/mysql-test/t/innodb_unsafe_binlog.test 1660share/mysql-test/t/innodb_unsafe_binlog.test
1598share/mysql-test/t/insert.test 1661share/mysql-test/t/insert.test
1599share/mysql-test/t/insert_notembedded.test 1662share/mysql-test/t/insert_notembedded.test
@@ -1608,84 +1671,93 @@ share/mysql-test/t/key.test @@ -1608,84 +1671,93 @@ share/mysql-test/t/key.test
1608share/mysql-test/t/key_cache-master.opt 1671share/mysql-test/t/key_cache-master.opt
1609share/mysql-test/t/key_cache.test 1672share/mysql-test/t/key_cache.test
1610share/mysql-test/t/key_diff.test 1673share/mysql-test/t/key_diff.test
1611share/mysql-test/t/key_primary.test 1674share/mysql-test/t/key_primary.test
1612share/mysql-test/t/keywords.test 1675share/mysql-test/t/keywords.test
1613share/mysql-test/t/kill.test 1676share/mysql-test/t/kill.test
1614share/mysql-test/t/kill_n_check.sh 1677share/mysql-test/t/kill_n_check.sh
1615share/mysql-test/t/limit.test 1678share/mysql-test/t/limit.test
1616share/mysql-test/t/loaddata.test 1679share/mysql-test/t/loaddata.test
1617share/mysql-test/t/loaddata_autocom_innodb.test 1680share/mysql-test/t/loaddata_autocom_innodb.test
1618share/mysql-test/t/loaddata_autocom_ndb.test 1681share/mysql-test/t/loaddata_autocom_ndb.test
1619share/mysql-test/t/lock.test 1682share/mysql-test/t/lock.test
1620share/mysql-test/t/lock_multi.test 1683share/mysql-test/t/lock_multi.test
 1684share/mysql-test/t/lock_multi_bug38499.test
 1685share/mysql-test/t/lock_multi_bug38691.test
1621share/mysql-test/t/lock_tables_lost_commit-master.opt 1686share/mysql-test/t/lock_tables_lost_commit-master.opt
1622share/mysql-test/t/lock_tables_lost_commit.test 1687share/mysql-test/t/lock_tables_lost_commit.test
1623share/mysql-test/t/log.sh 1688share/mysql-test/t/log.sh
1624share/mysql-test/t/long_tmpdir-master.opt 1689share/mysql-test/t/long_tmpdir-master.opt
1625share/mysql-test/t/long_tmpdir-master.sh 1690share/mysql-test/t/long_tmpdir-master.sh
1626share/mysql-test/t/long_tmpdir.test 1691share/mysql-test/t/long_tmpdir.test
1627share/mysql-test/t/lowercase_fs_off.test 1692share/mysql-test/t/lowercase_fs_off.test
1628share/mysql-test/t/lowercase_mixed_tmpdir-master.opt 1693share/mysql-test/t/lowercase_mixed_tmpdir-master.opt
1629share/mysql-test/t/lowercase_mixed_tmpdir-master.sh 1694share/mysql-test/t/lowercase_mixed_tmpdir-master.sh
1630share/mysql-test/t/lowercase_mixed_tmpdir.test 1695share/mysql-test/t/lowercase_mixed_tmpdir.test
1631share/mysql-test/t/lowercase_table-master.opt 1696share/mysql-test/t/lowercase_table-master.opt
1632share/mysql-test/t/lowercase_table.test 1697share/mysql-test/t/lowercase_table.test
1633share/mysql-test/t/lowercase_table2.test 1698share/mysql-test/t/lowercase_table2.test
1634share/mysql-test/t/lowercase_table3-master.opt 1699share/mysql-test/t/lowercase_table3-master.opt
1635share/mysql-test/t/lowercase_table3.test 1700share/mysql-test/t/lowercase_table3.test
1636share/mysql-test/t/lowercase_table_grant-master.opt 1701share/mysql-test/t/lowercase_table_grant-master.opt
1637share/mysql-test/t/lowercase_table_grant.test 1702share/mysql-test/t/lowercase_table_grant.test
1638share/mysql-test/t/lowercase_table_qcache-master.opt 1703share/mysql-test/t/lowercase_table_qcache-master.opt
1639share/mysql-test/t/lowercase_table_qcache.test 1704share/mysql-test/t/lowercase_table_qcache.test
 1705share/mysql-test/t/lowercase_utf8-master.opt
 1706share/mysql-test/t/lowercase_utf8.test
1640share/mysql-test/t/lowercase_view-master.opt 1707share/mysql-test/t/lowercase_view-master.opt
1641share/mysql-test/t/lowercase_view.test 1708share/mysql-test/t/lowercase_view.test
1642share/mysql-test/t/merge.test 1709share/mysql-test/t/merge.test
1643share/mysql-test/t/metadata.test 1710share/mysql-test/t/metadata.test
1644share/mysql-test/t/mix_innodb_myisam_binlog-master.opt 1711share/mysql-test/t/mix_innodb_myisam_binlog-master.opt
1645share/mysql-test/t/mix_innodb_myisam_binlog.test 1712share/mysql-test/t/mix_innodb_myisam_binlog.test
1646share/mysql-test/t/multi_statement-master.opt 1713share/mysql-test/t/multi_statement-master.opt
1647share/mysql-test/t/multi_statement.test 1714share/mysql-test/t/multi_statement.test
1648share/mysql-test/t/multi_update-master.opt 1715share/mysql-test/t/multi_update-master.opt
1649share/mysql-test/t/multi_update.test 1716share/mysql-test/t/multi_update.test
 1717share/mysql-test/t/multi_update2-master.opt
 1718share/mysql-test/t/multi_update2.test
1650share/mysql-test/t/multi_update_tiny_hash-master.opt 1719share/mysql-test/t/multi_update_tiny_hash-master.opt
1651share/mysql-test/t/multi_update_tiny_hash.test 1720share/mysql-test/t/multi_update_tiny_hash.test
1652share/mysql-test/t/myisam-blob-master.opt 1721share/mysql-test/t/myisam-blob-master.opt
1653share/mysql-test/t/myisam-blob.test 1722share/mysql-test/t/myisam-blob.test
1654share/mysql-test/t/myisam.test 1723share/mysql-test/t/myisam.test
1655share/mysql-test/t/myisampack.test 1724share/mysql-test/t/myisampack.test
 1725share/mysql-test/t/mysql-bug41486.test
 1726share/mysql-test/t/mysql-bug45236.test
1656share/mysql-test/t/mysql.test 1727share/mysql-test/t/mysql.test
1657share/mysql-test/t/mysql_client_test.opt 1728share/mysql-test/t/mysql_client_test.opt
1658share/mysql-test/t/mysql_client_test.test 1729share/mysql-test/t/mysql_client_test.test
1659share/mysql-test/t/mysql_comments.sql 1730share/mysql-test/t/mysql_comments.sql
1660share/mysql-test/t/mysql_comments.test 1731share/mysql-test/t/mysql_comments.test
1661share/mysql-test/t/mysql_delimiter.sql 1732share/mysql-test/t/mysql_delimiter.sql
1662share/mysql-test/t/mysql_delimiter_19799.sql 1733share/mysql-test/t/mysql_delimiter_19799.sql
1663share/mysql-test/t/mysql_delimiter_source.sql 1734share/mysql-test/t/mysql_delimiter_source.sql
1664share/mysql-test/t/mysql_protocols.test 1735share/mysql-test/t/mysql_protocols.test
1665share/mysql-test/t/mysql_upgrade.test 1736share/mysql-test/t/mysql_upgrade.test
1666share/mysql-test/t/mysqladmin.test 1737share/mysql-test/t/mysqladmin.test
1667share/mysql-test/t/mysqlbinlog-cp932-master.opt 1738share/mysql-test/t/mysqlbinlog-cp932-master.opt
1668share/mysql-test/t/mysqlbinlog-cp932.test 1739share/mysql-test/t/mysqlbinlog-cp932.test
1669share/mysql-test/t/mysqlbinlog-master.opt 1740share/mysql-test/t/mysqlbinlog-master.opt
1670share/mysql-test/t/mysqlbinlog.test 1741share/mysql-test/t/mysqlbinlog.test
1671share/mysql-test/t/mysqlbinlog2.test 1742share/mysql-test/t/mysqlbinlog2.test
1672share/mysql-test/t/mysqlcheck.test 1743share/mysql-test/t/mysqlcheck.test
1673share/mysql-test/t/mysqldump-compat.opt 1744share/mysql-test/t/mysqldump-compat.opt
1674share/mysql-test/t/mysqldump-compat.test 1745share/mysql-test/t/mysqldump-compat.test
1675share/mysql-test/t/mysqldump-max.test 1746share/mysql-test/t/mysqldump-max.test
1676share/mysql-test/t/mysqldump-no-binlog-master.opt 1747share/mysql-test/t/mysqldump-no-binlog-master.opt
1677share/mysql-test/t/mysqldump-no-binlog.test 1748share/mysql-test/t/mysqldump-no-binlog.test
1678share/mysql-test/t/mysqldump.test 1749share/mysql-test/t/mysqldump.test
 1750share/mysql-test/t/mysqldump_restore.test
1679share/mysql-test/t/mysqlshow.test 1751share/mysql-test/t/mysqlshow.test
1680share/mysql-test/t/mysqltest.test 1752share/mysql-test/t/mysqltest.test
1681share/mysql-test/t/named_pipe-master.opt 1753share/mysql-test/t/named_pipe-master.opt
1682share/mysql-test/t/named_pipe.test 1754share/mysql-test/t/named_pipe.test
1683share/mysql-test/t/ndb_alter_table.test 1755share/mysql-test/t/ndb_alter_table.test
1684share/mysql-test/t/ndb_alter_table2.test 1756share/mysql-test/t/ndb_alter_table2.test
1685share/mysql-test/t/ndb_auto_increment.test 1757share/mysql-test/t/ndb_auto_increment.test
1686share/mysql-test/t/ndb_autodiscover.test 1758share/mysql-test/t/ndb_autodiscover.test
1687share/mysql-test/t/ndb_autodiscover2-master.opt 1759share/mysql-test/t/ndb_autodiscover2-master.opt
1688share/mysql-test/t/ndb_autodiscover2.test 1760share/mysql-test/t/ndb_autodiscover2.test
1689share/mysql-test/t/ndb_autodiscover3.test 1761share/mysql-test/t/ndb_autodiscover3.test
1690share/mysql-test/t/ndb_backup_print.test 1762share/mysql-test/t/ndb_backup_print.test
1691share/mysql-test/t/ndb_basic.test 1763share/mysql-test/t/ndb_basic.test
@@ -1732,26 +1804,28 @@ share/mysql-test/t/null.test @@ -1732,26 +1804,28 @@ share/mysql-test/t/null.test
1732share/mysql-test/t/null_key.test 1804share/mysql-test/t/null_key.test
1733share/mysql-test/t/odbc.test 1805share/mysql-test/t/odbc.test
1734share/mysql-test/t/olap.test 1806share/mysql-test/t/olap.test
1735share/mysql-test/t/openssl_1.test 1807share/mysql-test/t/openssl_1.test
1736share/mysql-test/t/order_by.test 1808share/mysql-test/t/order_by.test
1737share/mysql-test/t/order_fill_sortbuf-master.opt 1809share/mysql-test/t/order_fill_sortbuf-master.opt
1738share/mysql-test/t/order_fill_sortbuf.test 1810share/mysql-test/t/order_fill_sortbuf.test
1739share/mysql-test/t/outfile.test 1811share/mysql-test/t/outfile.test
1740share/mysql-test/t/outfile_loaddata.test 1812share/mysql-test/t/outfile_loaddata.test
1741share/mysql-test/t/overflow.test 1813share/mysql-test/t/overflow.test
1742share/mysql-test/t/packet.test 1814share/mysql-test/t/packet.test
1743share/mysql-test/t/parser.test 1815share/mysql-test/t/parser.test
1744share/mysql-test/t/parser_precedence.test 1816share/mysql-test/t/parser_precedence.test
 1817share/mysql-test/t/parser_stack.test
 1818share/mysql-test/t/perror-win.test
1745share/mysql-test/t/perror.test 1819share/mysql-test/t/perror.test
1746share/mysql-test/t/preload.test 1820share/mysql-test/t/preload.test
1747share/mysql-test/t/profiling.test 1821share/mysql-test/t/profiling.test
1748share/mysql-test/t/ps-master.opt 1822share/mysql-test/t/ps-master.opt
1749share/mysql-test/t/ps.test 1823share/mysql-test/t/ps.test
1750share/mysql-test/t/ps_10nestset.test 1824share/mysql-test/t/ps_10nestset.test
1751share/mysql-test/t/ps_11bugs.test 1825share/mysql-test/t/ps_11bugs.test
1752share/mysql-test/t/ps_1general.test 1826share/mysql-test/t/ps_1general.test
1753share/mysql-test/t/ps_2myisam.test 1827share/mysql-test/t/ps_2myisam.test
1754share/mysql-test/t/ps_3innodb.test 1828share/mysql-test/t/ps_3innodb.test
1755share/mysql-test/t/ps_4heap.test 1829share/mysql-test/t/ps_4heap.test
1756share/mysql-test/t/ps_5merge.test 1830share/mysql-test/t/ps_5merge.test
1757share/mysql-test/t/ps_6bdb.test 1831share/mysql-test/t/ps_6bdb.test
@@ -1792,80 +1866,89 @@ share/mysql-test/t/rpl000015-slave.sh @@ -1792,80 +1866,89 @@ share/mysql-test/t/rpl000015-slave.sh
1792share/mysql-test/t/rpl000015.slave-mi 1866share/mysql-test/t/rpl000015.slave-mi
1793share/mysql-test/t/rpl000015.test 1867share/mysql-test/t/rpl000015.test
1794share/mysql-test/t/rpl000017-slave.opt 1868share/mysql-test/t/rpl000017-slave.opt
1795share/mysql-test/t/rpl000017-slave.sh 1869share/mysql-test/t/rpl000017-slave.sh
1796share/mysql-test/t/rpl000017.test 1870share/mysql-test/t/rpl000017.test
1797share/mysql-test/t/rpl000018-master.opt 1871share/mysql-test/t/rpl000018-master.opt
1798share/mysql-test/t/rpl000018-slave.opt 1872share/mysql-test/t/rpl000018-slave.opt
1799share/mysql-test/t/rpl_EE_error.test 1873share/mysql-test/t/rpl_EE_error.test
1800share/mysql-test/t/rpl_alter.test 1874share/mysql-test/t/rpl_alter.test
1801share/mysql-test/t/rpl_auto_increment-master.opt 1875share/mysql-test/t/rpl_auto_increment-master.opt
1802share/mysql-test/t/rpl_auto_increment.test 1876share/mysql-test/t/rpl_auto_increment.test
1803share/mysql-test/t/rpl_auto_increment_11932.test 1877share/mysql-test/t/rpl_auto_increment_11932.test
1804share/mysql-test/t/rpl_auto_increment_bug33029.test 1878share/mysql-test/t/rpl_auto_increment_bug33029.test
 1879share/mysql-test/t/rpl_begin_commit_rollback-slave.opt
 1880share/mysql-test/t/rpl_begin_commit_rollback.test
1805share/mysql-test/t/rpl_bug33931-slave.opt 1881share/mysql-test/t/rpl_bug33931-slave.opt
1806share/mysql-test/t/rpl_bug33931.test 1882share/mysql-test/t/rpl_bug33931.test
 1883share/mysql-test/t/rpl_bug38694-slave.opt
 1884share/mysql-test/t/rpl_bug38694.test
1807share/mysql-test/t/rpl_change_master.test 1885share/mysql-test/t/rpl_change_master.test
1808share/mysql-test/t/rpl_charset.test 1886share/mysql-test/t/rpl_charset.test
1809share/mysql-test/t/rpl_charset_sjis.test 1887share/mysql-test/t/rpl_charset_sjis.test
1810share/mysql-test/t/rpl_commit_after_flush.test 1888share/mysql-test/t/rpl_commit_after_flush.test
1811share/mysql-test/t/rpl_create_database-master.opt 1889share/mysql-test/t/rpl_create_database-master.opt
1812share/mysql-test/t/rpl_create_database-slave.opt 1890share/mysql-test/t/rpl_create_database-slave.opt
1813share/mysql-test/t/rpl_create_database.test 1891share/mysql-test/t/rpl_create_database.test
1814share/mysql-test/t/rpl_critical_errors.test 1892share/mysql-test/t/rpl_critical_errors.test
1815share/mysql-test/t/rpl_ddl.test 1893share/mysql-test/t/rpl_ddl.test
1816share/mysql-test/t/rpl_deadlock-slave.opt 1894share/mysql-test/t/rpl_deadlock-slave.opt
1817share/mysql-test/t/rpl_deadlock.test 1895share/mysql-test/t/rpl_deadlock.test
1818share/mysql-test/t/rpl_delete_all.test 1896share/mysql-test/t/rpl_delete_all.test
1819share/mysql-test/t/rpl_do_grant.test 1897share/mysql-test/t/rpl_do_grant.test
1820share/mysql-test/t/rpl_drop.test 1898share/mysql-test/t/rpl_drop.test
1821share/mysql-test/t/rpl_drop_db.test 1899share/mysql-test/t/rpl_drop_db.test
 1900share/mysql-test/t/rpl_drop_if_exists.test
1822share/mysql-test/t/rpl_drop_temp-slave.opt 1901share/mysql-test/t/rpl_drop_temp-slave.opt
1823share/mysql-test/t/rpl_drop_temp.test 1902share/mysql-test/t/rpl_drop_temp.test
1824share/mysql-test/t/rpl_drop_view.test 1903share/mysql-test/t/rpl_drop_view.test
1825share/mysql-test/t/rpl_dual_pos_advance-master.opt 1904share/mysql-test/t/rpl_dual_pos_advance-master.opt
1826share/mysql-test/t/rpl_dual_pos_advance-slave.opt 1905share/mysql-test/t/rpl_dual_pos_advance-slave.opt
1827share/mysql-test/t/rpl_dual_pos_advance.test 1906share/mysql-test/t/rpl_dual_pos_advance.test
1828share/mysql-test/t/rpl_empty_master_crash-master.opt 1907share/mysql-test/t/rpl_empty_master_crash-master.opt
1829share/mysql-test/t/rpl_empty_master_crash.test 1908share/mysql-test/t/rpl_empty_master_crash.test
1830share/mysql-test/t/rpl_error_ignored_table-slave.opt 1909share/mysql-test/t/rpl_error_ignored_table-slave.opt
1831share/mysql-test/t/rpl_error_ignored_table.test 1910share/mysql-test/t/rpl_error_ignored_table.test
1832share/mysql-test/t/rpl_failed_optimize-master.opt 1911share/mysql-test/t/rpl_failed_optimize-master.opt
1833share/mysql-test/t/rpl_failed_optimize.test 1912share/mysql-test/t/rpl_failed_optimize.test
 1913share/mysql-test/t/rpl_filter_tables_not_exist-slave.opt
 1914share/mysql-test/t/rpl_filter_tables_not_exist.test
1834share/mysql-test/t/rpl_flush_log_loop-master.opt 1915share/mysql-test/t/rpl_flush_log_loop-master.opt
1835share/mysql-test/t/rpl_flush_log_loop-master.sh 1916share/mysql-test/t/rpl_flush_log_loop-master.sh
1836share/mysql-test/t/rpl_flush_log_loop-slave.opt 1917share/mysql-test/t/rpl_flush_log_loop-slave.opt
1837share/mysql-test/t/rpl_flush_log_loop-slave.sh 1918share/mysql-test/t/rpl_flush_log_loop-slave.sh
1838share/mysql-test/t/rpl_flush_log_loop.test 1919share/mysql-test/t/rpl_flush_log_loop.test
1839share/mysql-test/t/rpl_flush_tables.test 1920share/mysql-test/t/rpl_flush_tables.test
1840share/mysql-test/t/rpl_free_items-slave.opt 1921share/mysql-test/t/rpl_free_items-slave.opt
1841share/mysql-test/t/rpl_free_items.test 1922share/mysql-test/t/rpl_free_items.test
1842share/mysql-test/t/rpl_get_lock.test 1923share/mysql-test/t/rpl_get_lock.test
1843share/mysql-test/t/rpl_grant.test 1924share/mysql-test/t/rpl_grant.test
1844share/mysql-test/t/rpl_ignore_grant-slave.opt 1925share/mysql-test/t/rpl_ignore_grant-slave.opt
1845share/mysql-test/t/rpl_ignore_grant.test 1926share/mysql-test/t/rpl_ignore_grant.test
1846share/mysql-test/t/rpl_ignore_revoke-slave.opt 1927share/mysql-test/t/rpl_ignore_revoke-slave.opt
1847share/mysql-test/t/rpl_ignore_revoke.test 1928share/mysql-test/t/rpl_ignore_revoke.test
1848share/mysql-test/t/rpl_ignore_table-slave.opt 1929share/mysql-test/t/rpl_ignore_table-slave.opt
1849share/mysql-test/t/rpl_ignore_table.test 1930share/mysql-test/t/rpl_ignore_table.test
1850share/mysql-test/t/rpl_init_slave-slave.opt 1931share/mysql-test/t/rpl_init_slave-slave.opt
1851share/mysql-test/t/rpl_init_slave.test 1932share/mysql-test/t/rpl_init_slave.test
1852share/mysql-test/t/rpl_innodb.test 1933share/mysql-test/t/rpl_innodb.test
1853share/mysql-test/t/rpl_insert_delayed.test 1934share/mysql-test/t/rpl_insert_delayed.test
1854share/mysql-test/t/rpl_insert_id-slave.opt 1935share/mysql-test/t/rpl_insert_id-slave.opt
1855share/mysql-test/t/rpl_insert_id.test 1936share/mysql-test/t/rpl_insert_id.test
1856share/mysql-test/t/rpl_insert_ignore-slave.opt 1937share/mysql-test/t/rpl_insert_ignore-slave.opt
1857share/mysql-test/t/rpl_insert_ignore.test 1938share/mysql-test/t/rpl_insert_ignore.test
1858share/mysql-test/t/rpl_insert_select.test 1939share/mysql-test/t/rpl_insert_select.test
 1940share/mysql-test/t/rpl_killed_ddl-master.opt
 1941share/mysql-test/t/rpl_killed_ddl.test
1859share/mysql-test/t/rpl_known_bugs_detection-master.opt 1942share/mysql-test/t/rpl_known_bugs_detection-master.opt
1860share/mysql-test/t/rpl_known_bugs_detection.test 1943share/mysql-test/t/rpl_known_bugs_detection.test
1861share/mysql-test/t/rpl_loaddata.test 1944share/mysql-test/t/rpl_loaddata.test
1862share/mysql-test/t/rpl_loaddata_charset.test 1945share/mysql-test/t/rpl_loaddata_charset.test
1863share/mysql-test/t/rpl_loaddata_map-master.opt 1946share/mysql-test/t/rpl_loaddata_map-master.opt
1864share/mysql-test/t/rpl_loaddata_map-slave.opt 1947share/mysql-test/t/rpl_loaddata_map-slave.opt
1865share/mysql-test/t/rpl_loaddata_map.test 1948share/mysql-test/t/rpl_loaddata_map.test
1866share/mysql-test/t/rpl_loaddata_rule_m-master.opt 1949share/mysql-test/t/rpl_loaddata_rule_m-master.opt
1867share/mysql-test/t/rpl_loaddata_rule_m.test 1950share/mysql-test/t/rpl_loaddata_rule_m.test
1868share/mysql-test/t/rpl_loaddata_rule_s-slave.opt 1951share/mysql-test/t/rpl_loaddata_rule_s-slave.opt
1869share/mysql-test/t/rpl_loaddata_rule_s.test 1952share/mysql-test/t/rpl_loaddata_rule_s.test
1870share/mysql-test/t/rpl_loaddatalocal.test 1953share/mysql-test/t/rpl_loaddatalocal.test
1871share/mysql-test/t/rpl_locale.test 1954share/mysql-test/t/rpl_locale.test
@@ -1880,26 +1963,27 @@ share/mysql-test/t/rpl_misc_functions-sl @@ -1880,26 +1963,27 @@ share/mysql-test/t/rpl_misc_functions-sl
1880share/mysql-test/t/rpl_misc_functions.test 1963share/mysql-test/t/rpl_misc_functions.test
1881share/mysql-test/t/rpl_multi_delete-slave.opt 1964share/mysql-test/t/rpl_multi_delete-slave.opt
1882share/mysql-test/t/rpl_multi_delete.test 1965share/mysql-test/t/rpl_multi_delete.test
1883share/mysql-test/t/rpl_multi_delete2-slave.opt 1966share/mysql-test/t/rpl_multi_delete2-slave.opt
1884share/mysql-test/t/rpl_multi_delete2.test 1967share/mysql-test/t/rpl_multi_delete2.test
1885share/mysql-test/t/rpl_multi_query.test 1968share/mysql-test/t/rpl_multi_query.test
1886share/mysql-test/t/rpl_multi_update.test 1969share/mysql-test/t/rpl_multi_update.test
1887share/mysql-test/t/rpl_multi_update2-slave.opt 1970share/mysql-test/t/rpl_multi_update2-slave.opt
1888share/mysql-test/t/rpl_multi_update2.test 1971share/mysql-test/t/rpl_multi_update2.test
1889share/mysql-test/t/rpl_multi_update3.test 1972share/mysql-test/t/rpl_multi_update3.test
1890share/mysql-test/t/rpl_multi_update4-slave.opt 1973share/mysql-test/t/rpl_multi_update4-slave.opt
1891share/mysql-test/t/rpl_multi_update4.test 1974share/mysql-test/t/rpl_multi_update4.test
1892share/mysql-test/t/rpl_mystery22.test 1975share/mysql-test/t/rpl_mystery22.test
 1976share/mysql-test/t/rpl_name_const.test
1893share/mysql-test/t/rpl_ndb_innodb_trans-slave.opt 1977share/mysql-test/t/rpl_ndb_innodb_trans-slave.opt
1894share/mysql-test/t/rpl_ndb_innodb_trans.test 1978share/mysql-test/t/rpl_ndb_innodb_trans.test
1895share/mysql-test/t/rpl_openssl.test 1979share/mysql-test/t/rpl_openssl.test
1896share/mysql-test/t/rpl_optimize.test 1980share/mysql-test/t/rpl_optimize.test
1897share/mysql-test/t/rpl_packet-master.opt 1981share/mysql-test/t/rpl_packet-master.opt
1898share/mysql-test/t/rpl_packet-slave.opt 1982share/mysql-test/t/rpl_packet-slave.opt
1899share/mysql-test/t/rpl_packet.test 1983share/mysql-test/t/rpl_packet.test
1900share/mysql-test/t/rpl_ps.test 1984share/mysql-test/t/rpl_ps.test
1901share/mysql-test/t/rpl_redirect.test 1985share/mysql-test/t/rpl_redirect.test
1902share/mysql-test/t/rpl_relayrotate-slave.opt 1986share/mysql-test/t/rpl_relayrotate-slave.opt
1903share/mysql-test/t/rpl_relayrotate.test 1987share/mysql-test/t/rpl_relayrotate.test
1904share/mysql-test/t/rpl_relayspace-slave.opt 1988share/mysql-test/t/rpl_relayspace-slave.opt
1905share/mysql-test/t/rpl_relayspace.test 1989share/mysql-test/t/rpl_relayspace.test
@@ -1930,78 +2014,81 @@ share/mysql-test/t/rpl_sp_effects-master @@ -1930,78 +2014,81 @@ share/mysql-test/t/rpl_sp_effects-master
1930share/mysql-test/t/rpl_sp_effects-slave.opt 2014share/mysql-test/t/rpl_sp_effects-slave.opt
1931share/mysql-test/t/rpl_sp_effects.test 2015share/mysql-test/t/rpl_sp_effects.test
1932share/mysql-test/t/rpl_sporadic_master-master.opt 2016share/mysql-test/t/rpl_sporadic_master-master.opt
1933share/mysql-test/t/rpl_sporadic_master.test 2017share/mysql-test/t/rpl_sporadic_master.test
1934share/mysql-test/t/rpl_ssl.test 2018share/mysql-test/t/rpl_ssl.test
1935share/mysql-test/t/rpl_start_stop_slave.test 2019share/mysql-test/t/rpl_start_stop_slave.test
1936share/mysql-test/t/rpl_temporary.test 2020share/mysql-test/t/rpl_temporary.test
1937share/mysql-test/t/rpl_timezone-master.opt 2021share/mysql-test/t/rpl_timezone-master.opt
1938share/mysql-test/t/rpl_timezone-slave.opt 2022share/mysql-test/t/rpl_timezone-slave.opt
1939share/mysql-test/t/rpl_timezone.test 2023share/mysql-test/t/rpl_timezone.test
1940share/mysql-test/t/rpl_transaction-master.opt 2024share/mysql-test/t/rpl_transaction-master.opt
1941share/mysql-test/t/rpl_transaction-slave.opt 2025share/mysql-test/t/rpl_transaction-slave.opt
1942share/mysql-test/t/rpl_transaction.test 2026share/mysql-test/t/rpl_transaction.test
1943share/mysql-test/t/rpl_trigger.test 2027share/mysql-test/t/rpl_trigger_not_windows.test
 2028share/mysql-test/t/rpl_trigger_windows.test
1944share/mysql-test/t/rpl_trunc_temp.test 2029share/mysql-test/t/rpl_trunc_temp.test
1945share/mysql-test/t/rpl_until.test 2030share/mysql-test/t/rpl_until.test
1946share/mysql-test/t/rpl_user.test 2031share/mysql-test/t/rpl_user.test
1947share/mysql-test/t/rpl_user_variables.test 2032share/mysql-test/t/rpl_user_variables.test
1948share/mysql-test/t/rpl_variables-master.opt 2033share/mysql-test/t/rpl_variables-master.opt
1949share/mysql-test/t/rpl_variables.test 2034share/mysql-test/t/rpl_variables.test
1950share/mysql-test/t/rpl_view-slave.opt 
1951share/mysql-test/t/rpl_view.test 2035share/mysql-test/t/rpl_view.test
1952share/mysql-test/t/schema.test 2036share/mysql-test/t/schema.test
1953share/mysql-test/t/select.test 2037share/mysql-test/t/select.test
1954share/mysql-test/t/select_found.test 2038share/mysql-test/t/select_found.test
1955share/mysql-test/t/select_safe.test 2039share/mysql-test/t/select_safe.test
1956share/mysql-test/t/shm-master.opt 2040share/mysql-test/t/shm-master.opt
1957share/mysql-test/t/shm.test 2041share/mysql-test/t/shm.test
1958share/mysql-test/t/show_check-master.opt 2042share/mysql-test/t/show_check-master.opt
1959share/mysql-test/t/show_check.test 2043share/mysql-test/t/show_check.test
1960share/mysql-test/t/skip_grants-master.opt 2044share/mysql-test/t/skip_grants-master.opt
1961share/mysql-test/t/skip_grants.test 2045share/mysql-test/t/skip_grants.test
1962share/mysql-test/t/skip_name_resolve-master.opt 2046share/mysql-test/t/skip_name_resolve-master.opt
1963share/mysql-test/t/skip_name_resolve.test 2047share/mysql-test/t/skip_name_resolve.test
1964share/mysql-test/t/sp-big.test 2048share/mysql-test/t/sp-big.test
1965share/mysql-test/t/sp-code.test 2049share/mysql-test/t/sp-code.test
1966share/mysql-test/t/sp-destruct.test 2050share/mysql-test/t/sp-destruct.test
1967share/mysql-test/t/sp-dynamic.test 2051share/mysql-test/t/sp-dynamic.test
1968share/mysql-test/t/sp-error.test 2052share/mysql-test/t/sp-error.test
 2053share/mysql-test/t/sp-fib.test
1969share/mysql-test/t/sp-prelocking.test 2054share/mysql-test/t/sp-prelocking.test
1970share/mysql-test/t/sp-security.test 2055share/mysql-test/t/sp-security.test
1971share/mysql-test/t/sp-threads.test 2056share/mysql-test/t/sp-threads.test
1972share/mysql-test/t/sp-ucs2.test 2057share/mysql-test/t/sp-ucs2.test
1973share/mysql-test/t/sp-vars.test 2058share/mysql-test/t/sp-vars.test
1974share/mysql-test/t/sp.test 2059share/mysql-test/t/sp.test
1975share/mysql-test/t/sp_notembedded.test 2060share/mysql-test/t/sp_notembedded.test
1976share/mysql-test/t/sp_stress_case.test 2061share/mysql-test/t/sp_stress_case.test
1977share/mysql-test/t/sp_trans.test 2062share/mysql-test/t/sp_trans.test
1978share/mysql-test/t/sp_trans_log.test 2063share/mysql-test/t/sp_trans_log.test
1979share/mysql-test/t/sql_mode.test 2064share/mysql-test/t/sql_mode.test
1980share/mysql-test/t/ssl-big.test 2065share/mysql-test/t/ssl-big.test
1981share/mysql-test/t/ssl.test 2066share/mysql-test/t/ssl.test
1982share/mysql-test/t/ssl_8k_key.test 2067share/mysql-test/t/ssl_8k_key.test
1983share/mysql-test/t/ssl_compress.test 2068share/mysql-test/t/ssl_compress.test
1984share/mysql-test/t/ssl_connect.test 2069share/mysql-test/t/ssl_connect.test
1985share/mysql-test/t/status.test 2070share/mysql-test/t/status.test
 2071share/mysql-test/t/status2.test
1986share/mysql-test/t/strict.test 2072share/mysql-test/t/strict.test
1987share/mysql-test/t/strict_autoinc_1myisam.test 2073share/mysql-test/t/strict_autoinc_1myisam.test
1988share/mysql-test/t/strict_autoinc_2innodb.test 2074share/mysql-test/t/strict_autoinc_2innodb.test
1989share/mysql-test/t/strict_autoinc_3heap.test 2075share/mysql-test/t/strict_autoinc_3heap.test
1990share/mysql-test/t/strict_autoinc_4bdb.test 2076share/mysql-test/t/strict_autoinc_4bdb.test
1991share/mysql-test/t/strict_autoinc_5ndb.test 2077share/mysql-test/t/strict_autoinc_5ndb.test
1992share/mysql-test/t/subselect.test 2078share/mysql-test/t/subselect.test
1993share/mysql-test/t/subselect2.test 2079share/mysql-test/t/subselect2.test
1994share/mysql-test/t/subselect3.test 2080share/mysql-test/t/subselect3.test
 2081share/mysql-test/t/subselect4.test
1995share/mysql-test/t/subselect_gis.test 2082share/mysql-test/t/subselect_gis.test
1996share/mysql-test/t/subselect_innodb.test 2083share/mysql-test/t/subselect_innodb.test
1997share/mysql-test/t/subselect_notembedded.test 2084share/mysql-test/t/subselect_notembedded.test
1998share/mysql-test/t/sum_distinct-big.test 2085share/mysql-test/t/sum_distinct-big.test
1999share/mysql-test/t/sum_distinct.test 2086share/mysql-test/t/sum_distinct.test
2000share/mysql-test/t/symlink.test 2087share/mysql-test/t/symlink.test
2001share/mysql-test/t/synchronization.test 2088share/mysql-test/t/synchronization.test
2002share/mysql-test/t/sysdate_is_now-master.opt 2089share/mysql-test/t/sysdate_is_now-master.opt
2003share/mysql-test/t/sysdate_is_now.test 2090share/mysql-test/t/sysdate_is_now.test
2004share/mysql-test/t/system_mysql_db.test 2091share/mysql-test/t/system_mysql_db.test
2005share/mysql-test/t/system_mysql_db_fix30020-master.opt 2092share/mysql-test/t/system_mysql_db_fix30020-master.opt
2006share/mysql-test/t/system_mysql_db_fix30020.test 2093share/mysql-test/t/system_mysql_db_fix30020.test
2007share/mysql-test/t/system_mysql_db_fix40123-master.opt 2094share/mysql-test/t/system_mysql_db_fix40123-master.opt
cvs diff -r1.22 -r1.23 pkgsrc/databases/mysql5-server/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-server/Attic/distinfo 2009/07/19 13:50:20 1.22
+++ pkgsrc/databases/mysql5-server/Attic/distinfo 2009/11/26 16:33:29 1.23
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1$NetBSD: distinfo,v 1.22 2009/07/19 13:50:20 tron Exp $ 1$NetBSD: distinfo,v 1.23 2009/11/26 16:33:29 tron Exp $
2 2
3SHA1 (mysql-5.0.67.tar.gz) = 168090a4698a3a5efa2f2c9380a4352d4433d377 3SHA1 (mysql-5.0.88.tar.gz) = 2dc7a462eaca1452eefd334888a6c40022deb352
4RMD160 (mysql-5.0.67.tar.gz) = 05d38a5f8d91cb4dac1ee446af96b28163bd3722 4RMD160 (mysql-5.0.88.tar.gz) = a3ba4bd04e573b4a0bab073f36eec3ff44348ae6
5Size (mysql-5.0.67.tar.gz) = 28370810 bytes 5Size (mysql-5.0.88.tar.gz) = 22932765 bytes
6SHA1 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023 6SHA1 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023
7SHA1 (patch-ab) = 7d3ff56e929f93b4843d62014a3f5f37cc1e84bc 7SHA1 (patch-ab) = 7c51a0214c3e6205605047c72b07eac6792600db
8SHA1 (patch-ac) = e35a56fd1cae5c471d51b52b2949406be891580c 
9SHA1 (patch-ad) = b3246e3b2a666dffb72830c3ca30050a1e1263ca 
10SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71 8SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
11SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec 9SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
12SHA1 (patch-ag) = 6412da46f0d891b64d90c2e3f9b79a1ec442d617 10SHA1 (patch-ag) = 6412da46f0d891b64d90c2e3f9b79a1ec442d617
13SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597 11SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597
14SHA1 (patch-ai) = 56d3f66a903224b8d27213480e7ea3e485e52f1d 12SHA1 (patch-ai) = 56d3f66a903224b8d27213480e7ea3e485e52f1d
15SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55 13SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55
16SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea 14SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea
17SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1 15SHA1 (patch-al) = a8232565e70d199b77e044152dee3df52564724b
18SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5 16SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
19SHA1 (patch-an) = 4017b68e0b67c07810f756a2bfbc138ede5c954d 17SHA1 (patch-an) = c4f856a64ac7e2cadecf594744176d09736468d5
20SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299 18SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
21SHA1 (patch-ca) = 97fe10dc40c5995b174f8e07dc5e22a72b9913f4 19SHA1 (patch-ca) = 97fe10dc40c5995b174f8e07dc5e22a72b9913f4
22SHA1 (patch-cb) = f7dbc53f2405bf8a38c3d307dc68560a1b79ed01 20SHA1 (patch-cb) = f7dbc53f2405bf8a38c3d307dc68560a1b79ed01
23SHA1 (patch-cc) = 0f4bc2bc83291c42381e39339e9b6507b7fd151a 21SHA1 (patch-cc) = 0f4bc2bc83291c42381e39339e9b6507b7fd151a
cvs diff -r1.5 -r1.6 pkgsrc/databases/mysql5-server/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-server/patches/Attic/patch-ab 2007/12/14 13:36:54 1.5
+++ pkgsrc/databases/mysql5-server/patches/Attic/patch-ab 2009/11/26 16:33:29 1.6
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-ab,v 1.5 2007/12/14 13:36:54 tron Exp $ 1$NetBSD: patch-ab,v 1.6 2009/11/26 16:33:29 tron Exp $
2 2
3--- tests/Makefile.in.orig 2007-11-15 14:08:50.000000000 +0000 3--- tests/Makefile.in.orig 2009-11-09 18:38:12.000000000 +0000
4+++ tests/Makefile.in 2007-12-13 23:57:31.000000000 +0000 4+++ tests/Makefile.in 2009-11-26 14:43:24.000000000 +0000
5@@ -96,7 +96,7 @@ 5@@ -92,7 +92,7 @@
6 am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \ 6 am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
7 my_memmem.$(OBJEXT) 7 my_memmem.$(OBJEXT)
8 mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS) 8 mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
9-am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la 9-am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la
10+am__DEPENDENCIES_1 = 10+am__DEPENDENCIES_1 =
11 am__DEPENDENCIES_2 = 11 am__DEPENDENCIES_2 =
12 mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ 12 mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
13 $(am__DEPENDENCIES_2) 13 $(am__DEPENDENCIES_2)
14@@ -106,7 +106,7 @@ 14@@ -102,7 +102,7 @@
15 thread_test_SOURCES = thread_test.c 15 thread_test_SOURCES = thread_test.c
16 thread_test_OBJECTS = thread_test.$(OBJEXT) 16 thread_test_OBJECTS = thread_test.$(OBJEXT)
17 thread_test_LDADD = $(LDADD) 17 thread_test_LDADD = $(LDADD)
18-thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la 18-thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
19+thread_test_DEPENDENCIES = 19+thread_test_DEPENDENCIES =
20 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include 20 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
21 depcomp = $(SHELL) $(top_srcdir)/depcomp 21 depcomp = $(SHELL) $(top_srcdir)/depcomp
22 am__depfiles_maybe = depfiles 22 am__depfiles_maybe = depfiles
23@@ -404,8 +404,7 @@ 23@@ -403,8 +403,7 @@
24 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ 24 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
25 $(openssl_includes) 25 $(openssl_includes)
26  26
27-LDADD = @CLIENT_EXTRA_LDFLAGS@ \ 27-LDADD = @CLIENT_EXTRA_LDFLAGS@ \
28- $(top_builddir)/libmysql/libmysqlclient.la 28- $(top_builddir)/libmysql/libmysqlclient.la
29+LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient 29+LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
30  30
31 mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) 31 mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
32 mysql_client_test_SOURCES = mysql_client_test.c\ 32 mysql_client_test_SOURCES = mysql_client_test.c\
cvs diff -r1.5 -r1.6 pkgsrc/databases/mysql5-server/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-server/patches/Attic/patch-an 2008/09/18 11:51:37 1.5
+++ pkgsrc/databases/mysql5-server/patches/Attic/patch-an 2009/11/26 16:33:29 1.6
@@ -1,37 +1,13 @@ @@ -1,37 +1,13 @@
1$NetBSD: patch-an,v 1.5 2008/09/18 11:51:37 taca Exp $ 1$NetBSD: patch-an,v 1.6 2009/11/26 16:33:29 tron Exp $
2 2
3--- mysql-test/Makefile.in.orig 2008-08-04 15:22:09.000000000 +0300 3--- mysql-test/Makefile.in.orig 2009-11-09 18:37:53.000000000 +0000
4+++ mysql-test/Makefile.in 2008-09-16 13:52:20.000000000 +0300 4+++ mysql-test/Makefile.in 2009-11-26 15:16:50.000000000 +0000
5@@ -371,7 +371,7 @@ 5@@ -368,7 +368,7 @@
6 @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\" 6 @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
7 @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\" 7 @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
8 benchdir_root = $(prefix) 8 benchdir_root = $(prefix)
9-testdir = $(benchdir_root)/mysql-test 9-testdir = $(benchdir_root)/mysql-test
10+testdir = $(benchdir_root)/share/mysql-test 10+testdir = $(benchdir_root)/share/mysql-test
11 EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) 11 EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
12 EXTRA_DIST = $(EXTRA_SCRIPTS) suite 12 EXTRA_DIST = $(EXTRA_SCRIPTS) suite collections
13 GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr 13 GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr
14@@ -749,15 +749,14 @@ 
15 -rm -rf `find $(distdir)/suite -type d -name SCCS` 
16  
17 install-data-local: 
18- $(mkinstalldirs) \ 
19- $(DESTDIR)$(testdir)/t \ 
20- $(DESTDIR)$(testdir)/r \ 
21- $(DESTDIR)$(testdir)/include \ 
22- $(DESTDIR)$(testdir)/std_data \ 
23- $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \ 
24- $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \ 
25- $(DESTDIR)$(testdir)/lib \ 
26- $(DESTDIR)$(testdir)/std_data/funcs_1 
27+ $(mkinstalldirs) $(DESTDIR)$(testdir)/t 
28+ $(mkinstalldirs) $(DESTDIR)$(testdir)/r 
29+ $(mkinstalldirs) $(DESTDIR)$(testdir)/include 
30+ $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data 
31+ $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be 
32+ $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le 
33+ $(mkinstalldirs) $(DESTDIR)$(testdir)/lib 
34+ $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/funcs_1 
35 $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) 
36 -$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t 
37 $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t 
File Deleted: pkgsrc/databases/mysql5-server/patches/Attic/patch-ac
File Deleted: pkgsrc/databases/mysql5-server/patches/Attic/patch-ad
cvs diff -r1.3 -r1.4 pkgsrc/databases/mysql5-server/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-server/patches/Attic/patch-al 2007/03/11 18:42:50 1.3
+++ pkgsrc/databases/mysql5-server/patches/Attic/patch-al 2009/11/26 16:33:29 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-al,v 1.3 2007/03/11 18:42:50 adam Exp $ 1$NetBSD: patch-al,v 1.4 2009/11/26 16:33:29 tron Exp $
2 2
3--- myisam/Makefile.in.orig 2007-03-05 20:22:55.000000000 +0100 3--- myisam/Makefile.in.orig 2009-11-09 18:37:52.000000000 +0000
4+++ myisam/Makefile.in 4+++ myisam/Makefile.in 2009-11-26 14:26:06.000000000 +0000
5@@ -156,7 +156,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD 5@@ -152,7 +152,7 @@
6 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ 6 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
7 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 7 --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
8 $(AM_CFLAGS) $(CFLAGS) 8 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9-CCLD = $(CC) 9-CCLD = $(CC)
10+CCLD = $(CXX) 10+CCLD = $(CXX)
11 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 11 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
12 $(AM_LDFLAGS) $(LDFLAGS) -o $@ 12 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
13 SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \ 13 $(LDFLAGS) -o $@