Thu May 7 12:45:29 2015 UTC ()
Update mariadb55-* to 5.5.43.

pkgsrc changes:
* Fix PLIST for dtrace and embedded-server options on and off.
* Patch for when readline>6 is used where some deprecated symbols were
  removed. Fixes build with devel/readline.
* DTrace support still not fixes for recent SunOS platforms.

upstream changes:
* XtraDB updated to 5.5.42-37.1
* TokuDB updated to version 7.5.6
* Fix for CVE-2015-0501
* Fix for CVE-2015-2571
* Fix for CVE-2015-0505
* Fix for CVE-2015-0499

See full changelog:

  https://mariadb.com/kb/en/mariadb/mariadb-5543-changelog/


(fhajny)
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Makefile.common
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/PLIST
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/options.mk
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/patches/patch-CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/patches/patch-client_mysql.cc
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/patches/patch-cmake_readline.cmake
diff -r0 -r1.1 pkgsrc/databases/mariadb55-client/patches/patch-cmake_dtrace.cmake
diff -r0 -r1.1 pkgsrc/databases/mariadb55-client/patches/patch-config.h.cmake
diff -r0 -r1.1 pkgsrc/databases/mariadb55-client/patches/patch-include_my__context.h
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-server/PLIST
diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-server/PLIST.SunOS
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/Attic/Makefile.common 2015/04/16 20:20:15 1.1
+++ pkgsrc/databases/mariadb55-client/Attic/Makefile.common 2015/05/07 12:45:28 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile.common,v 1.1 2015/04/16 20:20:15 ryoon Exp $ 1# $NetBSD: Makefile.common,v 1.2 2015/05/07 12:45:28 fhajny Exp $
2# 2#
3# used by databases/mariadb55-client/Makefile 3# used by databases/mariadb55-client/Makefile
4# used by databases/mariadb55-server/Makefile 4# used by databases/mariadb55-server/Makefile
5 5
6DISTNAME= mariadb-5.5.42 6DISTNAME= mariadb-5.5.43
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= https://downloads.mariadb.org/f/mariadb-5.5.42/source/ 8MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mariadb.org/ 11HOMEPAGE= http://www.mariadb.org/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb55-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb55-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mariadb55-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mariadb55-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run
20 20
21CXXFLAGS+= -fpermissive 21CXXFLAGS+= -fpermissive
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/Attic/PLIST 2015/04/16 20:20:15 1.1
+++ pkgsrc/databases/mariadb55-client/Attic/PLIST 2015/05/07 12:45:28 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2015/04/16 20:20:15 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.2 2015/05/07 12:45:28 fhajny Exp $
2bin/msql2mysql 2bin/msql2mysql
3bin/mysql 3bin/mysql
4bin/mysql_client_test 4bin/mysql_client_test
5bin/mysql_config 5bin/mysql_config
6bin/mysql_convert_table_format 6bin/mysql_convert_table_format
7bin/mysql_find_rows 7bin/mysql_find_rows
8bin/mysql_fix_extensions 8bin/mysql_fix_extensions
9bin/mysql_install_db 9bin/mysql_install_db
10bin/mysql_plugin 10bin/mysql_plugin
11bin/mysql_secure_installation 11bin/mysql_secure_installation
12bin/mysql_setpermission 12bin/mysql_setpermission
13bin/mysql_upgrade 13bin/mysql_upgrade
14bin/mysql_zap 14bin/mysql_zap
@@ -95,27 +95,27 @@ include/mysql/private/my_stacktrace.h @@ -95,27 +95,27 @@ include/mysql/private/my_stacktrace.h
95include/mysql/private/my_time.h 95include/mysql/private/my_time.h
96include/mysql/private/my_tree.h 96include/mysql/private/my_tree.h
97include/mysql/private/my_uctype.h 97include/mysql/private/my_uctype.h
98include/mysql/private/my_user.h 98include/mysql/private/my_user.h
99include/mysql/private/myisam.h 99include/mysql/private/myisam.h
100include/mysql/private/myisamchk.h 100include/mysql/private/myisamchk.h
101include/mysql/private/myisammrg.h 101include/mysql/private/myisammrg.h
102include/mysql/private/myisampack.h 102include/mysql/private/myisampack.h
103include/mysql/private/mysql_async.h 103include/mysql/private/mysql_async.h
104include/mysql/private/mysqld_default_groups.h 104include/mysql/private/mysqld_default_groups.h
105include/mysql/private/mysys_err.h 105include/mysql/private/mysys_err.h
106include/mysql/private/password.h 106include/mysql/private/password.h
107include/mysql/private/probes_mysql.h 107include/mysql/private/probes_mysql.h
108include/mysql/private/probes_mysql_dtrace.h 108${PLIST.dtrace}include/mysql/private/probes_mysql_dtrace.h
109include/mysql/private/probes_mysql_nodtrace.h 109include/mysql/private/probes_mysql_nodtrace.h
110include/mysql/private/queues.h 110include/mysql/private/queues.h
111include/mysql/private/rijndael.h 111include/mysql/private/rijndael.h
112include/mysql/private/service_versions.h 112include/mysql/private/service_versions.h
113include/mysql/private/sha1.h 113include/mysql/private/sha1.h
114include/mysql/private/sha2.h 114include/mysql/private/sha2.h
115include/mysql/private/t_ctype.h 115include/mysql/private/t_ctype.h
116include/mysql/private/thr_alarm.h 116include/mysql/private/thr_alarm.h
117include/mysql/private/thr_lock.h 117include/mysql/private/thr_lock.h
118include/mysql/private/thread_pool_priv.h 118include/mysql/private/thread_pool_priv.h
119include/mysql/private/violite.h 119include/mysql/private/violite.h
120include/mysql/private/waiting_threads.h 120include/mysql/private/waiting_threads.h
121include/mysql/private/welcome_copyright_notice.h 121include/mysql/private/welcome_copyright_notice.h
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/Attic/buildlink3.mk 2015/04/16 20:20:15 1.1
+++ pkgsrc/databases/mariadb55-client/Attic/buildlink3.mk 2015/05/07 12:45:28 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.1 2015/04/16 20:20:15 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $
2 2
3BUILDLINK_TREE+= mariadb-client 3BUILDLINK_TREE+= mariadb-client
4 4
5.if !defined(MARIADB_CLIENT_BUILDLINK3_MK) 5.if !defined(MARIADB_CLIENT_BUILDLINK3_MK)
6MARIADB_CLIENT_BUILDLINK3_MK:= 6MARIADB_CLIENT_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.mariadb-client+= mariadb-client>=5.5.42 8BUILDLINK_API_DEPENDS.mariadb-client+= mariadb-client>=5.5.43
9BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client 9BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client
10BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client 10BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client
11BUILDLINK_INCDIRS.mariadb-client?= include/mysql 11BUILDLINK_INCDIRS.mariadb-client?= include/mysql
12BUILDLINK_LIBDIRS.mariadb-client?= lib 12BUILDLINK_LIBDIRS.mariadb-client?= lib
13 13
14.include "../../devel/zlib/buildlink3.mk" 14.include "../../devel/zlib/buildlink3.mk"
15.include "../../security/openssl/buildlink3.mk" 15.include "../../security/openssl/buildlink3.mk"
16.endif # MARIADB_CLIENT_BUILDLINK3_MK 16.endif # MARIADB_CLIENT_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -mariadb-client 18BUILDLINK_TREE+= -mariadb-client
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/Attic/distinfo 2015/04/16 20:20:15 1.1
+++ pkgsrc/databases/mariadb55-client/Attic/distinfo 2015/05/07 12:45:28 1.2
@@ -1,32 +1,35 @@ @@ -1,32 +1,35 @@
1$NetBSD: distinfo,v 1.1 2015/04/16 20:20:15 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2015/05/07 12:45:28 fhajny Exp $
2 2
3SHA1 (mariadb-5.5.42.tar.gz) = df5164df0ff3f21fac4400932dc075864b0fac98 3SHA1 (mariadb-5.5.43.tar.gz) = 80223c91ecda64ec30a5056af225eee39a3782fd
4RMD160 (mariadb-5.5.42.tar.gz) = d9633171d9184498dba14837d1cf307fd4342079 4RMD160 (mariadb-5.5.43.tar.gz) = 93296e8d9e14949d47d4d0195f566891ba83bc76
5Size (mariadb-5.5.42.tar.gz) = 45586372 bytes 5Size (mariadb-5.5.43.tar.gz) = 45651398 bytes
6SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a 6SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a
7RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a 7RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a
8Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes 8Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes
9SHA1 (patch-BUILD_compile-pentium-gcov) = 02b414235a2cdfc1d5c95946010e0cdbada76c5d 9SHA1 (patch-BUILD_compile-pentium-gcov) = 02b414235a2cdfc1d5c95946010e0cdbada76c5d
10SHA1 (patch-CMakeLists.txt) = cc69f38e761ee5956dde27745377acde1728d63b 10SHA1 (patch-CMakeLists.txt) = 9c56523626837ab83ecef26f1c0609e084976fa7
11SHA1 (patch-client_completion_hash.cc) = 810dab31e17a19804323059d38f5ec7f0d55c3ab 11SHA1 (patch-client_completion_hash.cc) = 810dab31e17a19804323059d38f5ec7f0d55c3ab
12SHA1 (patch-client_mysql.cc) = a5296801f6960f77da12eeb749cc32a86f6bc545 12SHA1 (patch-client_mysql.cc) = bb50cbd627ce71bcc792ad285016e0269dbc741c
13SHA1 (patch-client_mysqladmin.cc) = ab05c6944d50c9b22365426656f0b61a5906d632 13SHA1 (patch-client_mysqladmin.cc) = ab05c6944d50c9b22365426656f0b61a5906d632
14SHA1 (patch-client_mysqlbinlog.cc) = 00146dfd7d0a6e0bb1a8c30395bc707af3b4a6c7 14SHA1 (patch-client_mysqlbinlog.cc) = 00146dfd7d0a6e0bb1a8c30395bc707af3b4a6c7
15SHA1 (patch-client_mysqlshow.c) = 82ddfb98ab85b3e96e56b5ecc0df25cc315b8dbc 15SHA1 (patch-client_mysqlshow.c) = 82ddfb98ab85b3e96e56b5ecc0df25cc315b8dbc
 16SHA1 (patch-cmake_dtrace.cmake) = 460799dee4d7f9d6c1e3b2dbf0412f8576297991
16SHA1 (patch-cmake_libutils.cmake) = 0c3f25f8e73ab0a062b539a8d551342a6ddf57c4 17SHA1 (patch-cmake_libutils.cmake) = 0c3f25f8e73ab0a062b539a8d551342a6ddf57c4
17SHA1 (patch-cmake_plugin.cmake) = b7566d25c80c2492a96c5617b96f9b6212b0fe93 18SHA1 (patch-cmake_plugin.cmake) = b7566d25c80c2492a96c5617b96f9b6212b0fe93
18SHA1 (patch-cmake_readline.cmake) = 5b975b817c5c62712e061b121056816425368e92 19SHA1 (patch-cmake_readline.cmake) = eeadad96a6c8f042c82134b5488956f8094ba4ac
 20SHA1 (patch-config.h.cmake) = 75d4c09eb34353057c6a8e36523f55d1bfdace59
19SHA1 (patch-include_CMakeLists.txt) = 9ce9db088fda6ed76039b818c27b74d584bae151 21SHA1 (patch-include_CMakeLists.txt) = 9ce9db088fda6ed76039b818c27b74d584bae151
 22SHA1 (patch-include_my__context.h) = 2f74d458d10c24261fdd532d197b84c44719c552
20SHA1 (patch-include_my_compare.h) = 9d04f444d56d705f3a57add7ad5f8fc5c7ce8341 23SHA1 (patch-include_my_compare.h) = 9d04f444d56d705f3a57add7ad5f8fc5c7ce8341
21SHA1 (patch-include_my_net.h) = b6361a0871afdf66feabc82c5ad3559ff5b34c37 24SHA1 (patch-include_my_net.h) = b6361a0871afdf66feabc82c5ad3559ff5b34c37
22SHA1 (patch-include_my_pthread.h) = 6d4ec91f90e717b0a075133fea535ee62d64d3ef 25SHA1 (patch-include_my_pthread.h) = 6d4ec91f90e717b0a075133fea535ee62d64d3ef
23SHA1 (patch-include_myisam.h) = 4cc8fd0bcba5ae8fdc4882048351b6225f00d2c5 26SHA1 (patch-include_myisam.h) = 4cc8fd0bcba5ae8fdc4882048351b6225f00d2c5
24SHA1 (patch-include_violite.h) = 89c21f49751e06324fd32773e03561bd9cce33d7 27SHA1 (patch-include_violite.h) = 89c21f49751e06324fd32773e03561bd9cce33d7
25SHA1 (patch-libmysql_CMakeLists.txt) = bca5243b76ea783e5b39e619528b28095aa1392a 28SHA1 (patch-libmysql_CMakeLists.txt) = bca5243b76ea783e5b39e619528b28095aa1392a
26SHA1 (patch-mysys_my__getopt.c) = 76ed2ffb774a7171bb547b3098db148329cbe21d 29SHA1 (patch-mysys_my__getopt.c) = 76ed2ffb774a7171bb547b3098db148329cbe21d
27SHA1 (patch-mysys_stacktrace.c) = 9f18875126208c30d41f896f0e6edc7000df0c73 30SHA1 (patch-mysys_stacktrace.c) = 9f18875126208c30d41f896f0e6edc7000df0c73
28SHA1 (patch-scripts_CMakeLists.txt) = 5e30442df51009fd253b0f3c99526b587b2626ff 31SHA1 (patch-scripts_CMakeLists.txt) = 5e30442df51009fd253b0f3c99526b587b2626ff
29SHA1 (patch-scripts_mysqld_safe.sh) = 5ce94ea8ebce4041fe9ba4753a18b378052aab4d 32SHA1 (patch-scripts_mysqld_safe.sh) = 5ce94ea8ebce4041fe9ba4753a18b378052aab4d
30SHA1 (patch-sql-common_client__plugin.c) = 507fb154013dc66218f36fe12e8b28eb8774d090 33SHA1 (patch-sql-common_client__plugin.c) = 507fb154013dc66218f36fe12e8b28eb8774d090
31SHA1 (patch-sql_CMakeLists.txt) = fd2bfb8cbb74ea806b95a6c02b282197c3f8c04c 34SHA1 (patch-sql_CMakeLists.txt) = fd2bfb8cbb74ea806b95a6c02b282197c3f8c04c
32SHA1 (patch-sql_log_event.h) = 8d2700e370e77d3f6cb441b67b3d19f13d77e600 35SHA1 (patch-sql_log_event.h) = 8d2700e370e77d3f6cb441b67b3d19f13d77e600
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/Attic/options.mk 2015/04/16 20:20:15 1.1
+++ pkgsrc/databases/mariadb55-client/Attic/options.mk 2015/05/07 12:45:28 1.2
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: options.mk,v 1.1 2015/04/16 20:20:15 ryoon Exp $ 1# $NetBSD: options.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mariadb55 3PKG_OPTIONS_VAR= PKG_OPTIONS.mariadb55
4 4
5# ndb-cluster does not configure with cmake 5# ndb-cluster does not configure with cmake
6PKG_SUPPORTED_OPTIONS+= dtrace embedded-server ndb-cluster sphinx ssl 6PKG_SUPPORTED_OPTIONS+= dtrace embedded-server ndb-cluster sphinx ssl
7PKG_SUGGESTED_OPTIONS+= embedded-server ssl 7PKG_SUGGESTED_OPTIONS+= embedded-server ssl
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11# Enable OpenSSL support 11# Enable OpenSSL support
12.if !empty(PKG_OPTIONS:Mssl) 12.if !empty(PKG_OPTIONS:Mssl)
13. include "../../security/openssl/buildlink3.mk" 13. include "../../security/openssl/buildlink3.mk"
14CMAKE_ARGS+= -DWITH_SSL=system 14CMAKE_ARGS+= -DWITH_SSL=system
15.else 15.else
16CMAKE_ARGS+= -DWITH_SSL=no 16CMAKE_ARGS+= -DWITH_SSL=no
17.endif 17.endif
18 18
19# Enable DTrace support 19# Enable DTrace support
 20PLIST_VARS+= dtrace
20.if !empty(PKG_OPTIONS:Mdtrace) 21.if !empty(PKG_OPTIONS:Mdtrace)
21CMAKE_ARGS+= -DENABLE_DTRACE=ON 22CMAKE_ARGS+= -DENABLE_DTRACE=ON
 23PLIST.dtrace= yes
22.endif 24.endif
23 25
24# Enable Sphinx SE support 26# Enable Sphinx SE support
25# http://sphinxsearch.com/docs/current.html#sphinxse-overview 27# http://sphinxsearch.com/docs/current.html#sphinxse-overview
26PLIST_VARS+= sphinx 28PLIST_VARS+= sphinx
27.if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi) 29.if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
28SPHINX_VER= 2.2.7 30SPHINX_VER= 2.2.7
29DISTFILES= ${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX} 31DISTFILES= ${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
30SITES.sphinx-2.2.7-release.tar.gz= http://sphinxsearch.com/files/ 32SITES.sphinx-2.2.7-release.tar.gz= http://sphinxsearch.com/files/
31.if !empty(PKGPATH:Mdatabases/mariadb55-server) 33.if !empty(PKGPATH:Mdatabases/mariadb55-server)
32MESSAGE_SRC= ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx 34MESSAGE_SRC= ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
33.endif 35.endif
34PLIST.sphinx= yes 36PLIST.sphinx= yes
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/patches/Attic/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/patches/Attic/patch-CMakeLists.txt 2015/04/16 20:20:15 1.1
+++ pkgsrc/databases/mariadb55-client/patches/Attic/patch-CMakeLists.txt 2015/05/07 12:45:29 1.2
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2015/04/16 20:20:15 ryoon Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2015/05/07 12:45:29 fhajny Exp $
2 2
3Split configuration between mysql-client and mysql-server. 3Split configuration between mysql-client and mysql-server.
4Build with newer DTrace. 4Build with newer DTrace.
5 5
6--- CMakeLists.txt.orig 2015-02-13 12:07:00.000000000 +0000 6--- CMakeLists.txt.orig 2015-02-13 12:07:00.000000000 +0000
7+++ CMakeLists.txt 7+++ CMakeLists.txt
8@@ -154,6 +154,7 @@ IF(DISABLE_SHARED) 8@@ -154,6 +154,7 @@ IF(DISABLE_SHARED)
9 SET(WITHOUT_DYNAMIC_PLUGINS 1) 9 SET(WITHOUT_DYNAMIC_PLUGINS 1)
10 ENDIF() 10 ENDIF()
11 OPTION(ENABLED_PROFILING "Enable profiling" ON) 11 OPTION(ENABLED_PROFILING "Enable profiling" ON)
12+OPTION(ENABLED_DTRACE "Include support for DTrace probes" OFF) 12+OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF)
13 OPTION(CYBOZU "" OFF) 13 OPTION(CYBOZU "" OFF)
14 OPTION(BACKUP_TEST "" OFF) 14 OPTION(BACKUP_TEST "" OFF)
15 OPTION(WITHOUT_SERVER OFF) 15 OPTION(WITHOUT_SERVER OFF)
16@@ -380,22 +381,24 @@ IF(NOT WITHOUT_SERVER) 16@@ -380,22 +381,24 @@ IF(NOT WITHOUT_SERVER)
17 CONFIGURE_PLUGINS() 17 CONFIGURE_PLUGINS()
18 ENDIF() 18 ENDIF()
19  19
20-ADD_SUBDIRECTORY(include) 20-ADD_SUBDIRECTORY(include)
21 ADD_SUBDIRECTORY(dbug) 21 ADD_SUBDIRECTORY(dbug)
22 ADD_SUBDIRECTORY(strings) 22 ADD_SUBDIRECTORY(strings)
23 ADD_SUBDIRECTORY(vio) 23 ADD_SUBDIRECTORY(vio)
24 ADD_SUBDIRECTORY(regex) 24 ADD_SUBDIRECTORY(regex)
25 ADD_SUBDIRECTORY(mysys) 25 ADD_SUBDIRECTORY(mysys)
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/patches/Attic/patch-client_mysql.cc (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/patches/Attic/patch-client_mysql.cc 2015/04/16 20:20:15 1.1
+++ pkgsrc/databases/mariadb55-client/patches/Attic/patch-client_mysql.cc 2015/05/07 12:45:29 1.2
@@ -1,13 +1,34 @@ @@ -1,13 +1,34 @@
1$NetBSD: patch-client_mysql.cc,v 1.1 2015/04/16 20:20:15 ryoon Exp $ 1$NetBSD: patch-client_mysql.cc,v 1.2 2015/05/07 12:45:29 fhajny Exp $
2 2
3--- client/mysql.cc.orig 2015-02-13 12:07:00.000000000 +0000 3--- client/mysql.cc.orig 2015-02-13 12:07:00.000000000 +0000
4+++ client/mysql.cc 4+++ client/mysql.cc
5@@ -89,7 +89,7 @@ extern "C" { 5@@ -89,7 +89,7 @@ extern "C" {
6 #if defined(__WIN__) 6 #if defined(__WIN__)
7 #include <conio.h> 7 #include <conio.h>
8 #else 8 #else
9-#include <readline.h> 9-#include <readline.h>
10+#include <readline/readline.h> 10+#include <readline/readline.h>
11 #define HAVE_READLINE 11 #define HAVE_READLINE
12 #define USE_POPEN 12 #define USE_POPEN
13 #endif 13 #endif
 14@@ -2640,7 +2640,11 @@ static void initialize_readline (char *n
 15 rl_completion_entry_function= &no_completion;
 16 rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
 17 #else
 18+# if defined(USE_READLINE_V6)
 19+ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
 20+# else
 21 rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
 22+# endif
 23 rl_completion_entry_function= &no_completion;
 24 #endif
 25 }
 26@@ -2657,7 +2661,7 @@ static char **new_mysql_completion(const
 27 int end __attribute__((unused)))
 28 {
 29 if (!status.batch && !quick)
 30-#if defined(USE_NEW_READLINE_INTERFACE)
 31+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_READLINE_V6)
 32 return rl_completion_matches(text, new_command_generator);
 33 #else
 34 return completion_matches((char *)text, (CPFunction *)new_command_generator);
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/patches/Attic/patch-cmake_readline.cmake (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/patches/Attic/patch-cmake_readline.cmake 2015/04/16 20:20:15 1.1
+++ pkgsrc/databases/mariadb55-client/patches/Attic/patch-cmake_readline.cmake 2015/05/07 12:45:29 1.2
@@ -1,51 +1,71 @@ @@ -1,51 +1,71 @@
1$NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $ 1$NetBSD: patch-cmake_readline.cmake,v 1.2 2015/05/07 12:45:29 fhajny Exp $
2 
3* Fix cmake's check build error. Borrowed from mysql56's readline.cmake. 
4 2
 3Fix cmake's check build error. Borrowed from mysql56's readline.cmake.
 4Fi build with pkgsrc readline>=6 that removed some deprecated symbols.
5--- cmake/readline.cmake.orig 2015-02-13 12:07:00.000000000 +0000 5--- cmake/readline.cmake.orig 2015-02-13 12:07:00.000000000 +0000
6+++ cmake/readline.cmake 6+++ cmake/readline.cmake
7@@ -132,7 +132,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE) 7@@ -132,7 +132,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
8 SET(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR}) 8 SET(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR})
9 CHECK_CXX_SOURCE_COMPILES(" 9 CHECK_CXX_SOURCE_COMPILES("
10 #include <stdio.h> 10 #include <stdio.h>
11- #include <readline.h> 11- #include <readline.h>
12+ #include <readline/readline.h> 12+ #include <readline/readline.h>
13 int main(int argc, char **argv) 13 int main(int argc, char **argv)
14 { 14 {
15 rl_completion_func_t *func1= (rl_completion_func_t*)0; 15 rl_completion_func_t *func1= (rl_completion_func_t*)0;
16@@ -142,7 +142,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE) 16@@ -142,7 +142,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
17  17
18 CHECK_C_SOURCE_COMPILES(" 18 CHECK_C_SOURCE_COMPILES("
19 #include <stdio.h> 19 #include <stdio.h>
20- #include <readline.h> 20- #include <readline.h>
21+ #include <readline/readline.h> 21+ #include <readline/readline.h>
22 #if RL_VERSION_MAJOR > 5 22 #if RL_VERSION_MAJOR > 5
23 #error 23 #error
24 #endif 24 #endif
25@@ -180,8 +180,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) 25@@ -152,6 +152,19 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
 26 }"
 27 READLINE_V5)
 28
 29+ CHECK_C_SOURCE_COMPILES("
 30+ #include <stdio.h>
 31+ #include <readline/readline.h>
 32+ #if RL_VERSION_MAJOR < 6
 33+ #error
 34+ #endif
 35+ int main(int argc, char **argv)
 36+ {
 37+ return 0;
 38+ }"
 39+ READLINE_V6)
 40+ SET(USE_READLINE_V6 ${READLINE_V6})
 41+
 42 IF(NEW_READLINE_INTERFACE)
 43 IF (READLINE_V5)
 44 SET(USE_NEW_READLINE_INTERFACE 1)
 45@@ -180,8 +193,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
26 #include <readline.h> 46 #include <readline.h>
27 int main(int argc, char **argv) 47 int main(int argc, char **argv)
28 { 48 {
29- int res= (*rl_completion_entry_function)(0,0); 49- int res= (*rl_completion_entry_function)(0,0);
30+ typedef int MYFunction(const char*, int); 50+ typedef int MYFunction(const char*, int);
31+ MYFunction* myf= rl_completion_entry_function; 51+ MYFunction* myf= rl_completion_entry_function;
32+ int res= (myf)(NULL, 0); 52+ int res= (myf)(NULL, 0);
33 completion_matches(0,0); 53 completion_matches(0,0);
34+ return res; 54+ return res;
35 }" 55 }"
36 LIBEDIT_INTERFACE) 56 LIBEDIT_INTERFACE)
37 SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) 57 SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE})
38@@ -195,32 +198,13 @@ MACRO (MYSQL_CHECK_READLINE) 58@@ -195,32 +211,13 @@ MACRO (MYSQL_CHECK_READLINE)
39 SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline") 59 SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline")
40 FIND_CURSES() 60 FIND_CURSES()
41  61
42- IF(WITH_READLINE) 62- IF(WITH_READLINE)
43- MYSQL_USE_BUNDLED_READLINE() 63- MYSQL_USE_BUNDLED_READLINE()
44- ELSE() 64- ELSE()
45- # OSX includes incompatible readline lib 65- # OSX includes incompatible readline lib
46- IF (NOT APPLE) 66- IF (NOT APPLE)
47- MYSQL_FIND_SYSTEM_READLINE() 67- MYSQL_FIND_SYSTEM_READLINE()
48- ENDIF() 68- ENDIF()
49- IF(USE_NEW_READLINE_INTERFACE) 69- IF(USE_NEW_READLINE_INTERFACE)
50- SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR}) 70- SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR})
51- SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY} ${CURSES_LIBRARY}) 71- SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY} ${CURSES_LIBRARY})
File Added: pkgsrc/databases/mariadb55-client/patches/Attic/patch-cmake_dtrace.cmake
$NetBSD: patch-cmake_dtrace.cmake,v 1.1 2015/05/07 12:45:29 fhajny Exp $

Build with newer DTrace.

--- cmake/dtrace.cmake.orig	2014-05-10 22:36:23.000000000 +0000
+++ cmake/dtrace.cmake
@@ -40,10 +40,10 @@ MACRO(CHECK_DTRACE)
  ENDIF()
 
  # On FreeBSD, dtrace does not handle userland tracing yet
- IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
-     AND NOT BUGGY_GCC_NO_DTRACE_MODULES
-     AND NOT BUGGY_LINUX_DTRACE) 
-   SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
+ IF(ENABLE_DTRACE AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
+    OR BUGGY_GCC_NO_DTRACE_MODULES
+    OR BUGGY_LINUX_DTRACE OR NOT DTRACE))
+  MESSAGE(FATAL_ERROR "dtrace is not supported on this system")
  ENDIF()
  SET(HAVE_DTRACE ${ENABLE_DTRACE})
  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
File Added: pkgsrc/databases/mariadb55-client/patches/Attic/patch-config.h.cmake
$NetBSD: patch-config.h.cmake,v 1.1 2015/05/07 12:45:29 fhajny Exp $

--- config.h.cmake.orig	2015-02-13 12:07:00.000000000 +0000
+++ config.h.cmake
@@ -126,6 +126,7 @@
 #cmakedefine HAVE_HIST_ENTRY 1
 #cmakedefine USE_LIBEDIT_INTERFACE 1
 #cmakedefine USE_NEW_READLINE_INTERFACE 1
+#cmakedefine USE_READLINE_V6 1
 
 #cmakedefine FIONREAD_IN_SYS_IOCTL 1
 #cmakedefine GWINSZ_IN_SYS_IOCTL 1
File Added: pkgsrc/databases/mariadb55-client/patches/Attic/patch-include_my__context.h
$NetBSD: patch-include_my__context.h,v 1.1 2015/05/07 12:45:29 fhajny Exp $

--- include/my_context.h.orig	2015-02-13 12:07:01.000000000 +0000
+++ include/my_context.h
@@ -27,9 +27,9 @@
 
 #ifdef __WIN__
 #define MY_CONTEXT_USE_WIN32_FIBERS 1
-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__)
+#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__) && !defined(__sun)
 #define MY_CONTEXT_USE_X86_64_GCC_ASM
-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
+#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) && !defined(__sun)
 #define MY_CONTEXT_USE_I386_GCC_ASM
 #elif defined(HAVE_UCONTEXT)
 #define MY_CONTEXT_USE_UCONTEXT
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-server/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-server/Attic/PLIST 2015/04/16 20:21:19 1.1
+++ pkgsrc/databases/mariadb55-server/Attic/PLIST 2015/05/07 12:45:29 1.2
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1@comment $NetBSD: PLIST,v 1.1 2015/04/16 20:21:19 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.2 2015/05/07 12:45:29 fhajny Exp $
2bin/aria_chk 2bin/aria_chk
3bin/aria_dump_log 3bin/aria_dump_log
4bin/aria_ftdump 4bin/aria_ftdump
5bin/aria_pack 5bin/aria_pack
6bin/aria_read_log 6bin/aria_read_log
7bin/innochecksum 7bin/innochecksum
8bin/my_print_defaults 8bin/my_print_defaults
9bin/myisam_ftdump 9bin/myisam_ftdump
10bin/myisamchk 10bin/myisamchk
11bin/myisamlog 11bin/myisamlog
12bin/myisampack 12bin/myisampack
13bin/mysql_client_test_embedded 13${PLIST.embedded}bin/mysql_client_test_embedded
14bin/mysql_embedded 14${PLIST.embedded}bin/mysql_embedded
15bin/mysql_tzinfo_to_sql 15bin/mysql_tzinfo_to_sql
16bin/mysql_waitpid 16bin/mysql_waitpid
17bin/mysqltest_embedded 17${PLIST.embedded}bin/mysqltest_embedded
18bin/perror 18bin/perror
19bin/replace 19bin/replace
20bin/resolve_stack_dump 20bin/resolve_stack_dump
21bin/resolveip 21bin/resolveip
22include/mysql/private/authors.h 22include/mysql/private/authors.h
23include/mysql/private/client_settings.h 23include/mysql/private/client_settings.h
24include/mysql/private/contributors.h 24include/mysql/private/contributors.h
25include/mysql/private/create_options.h 25include/mysql/private/create_options.h
26include/mysql/private/custom_conf.h 26include/mysql/private/custom_conf.h
27include/mysql/private/datadict.h 27include/mysql/private/datadict.h
28include/mysql/private/debug_sync.h 28include/mysql/private/debug_sync.h
29include/mysql/private/derror.h 29include/mysql/private/derror.h
30include/mysql/private/des_key_file.h 30include/mysql/private/des_key_file.h
31include/mysql/private/discover.h 31include/mysql/private/discover.h
32include/mysql/private/embedded_priv.h 32${PLIST.embedded}include/mysql/private/embedded_priv.h
33include/mysql/private/event_data_objects.h 33include/mysql/private/event_data_objects.h
34include/mysql/private/event_db_repository.h 34include/mysql/private/event_db_repository.h
35include/mysql/private/event_parse_data.h 35include/mysql/private/event_parse_data.h
36include/mysql/private/event_queue.h 36include/mysql/private/event_queue.h
37include/mysql/private/event_scheduler.h 37include/mysql/private/event_scheduler.h
38include/mysql/private/events.h 38include/mysql/private/events.h
39include/mysql/private/field.h 39include/mysql/private/field.h
40include/mysql/private/filesort.h 40include/mysql/private/filesort.h
41include/mysql/private/frm_crypt.h 41include/mysql/private/frm_crypt.h
42include/mysql/private/gcalc_slicescan.h 42include/mysql/private/gcalc_slicescan.h
43include/mysql/private/gcalc_tools.h 43include/mysql/private/gcalc_tools.h
44include/mysql/private/gstream.h 44include/mysql/private/gstream.h
45include/mysql/private/ha_ndbcluster.h 45include/mysql/private/ha_ndbcluster.h
@@ -177,29 +177,29 @@ include/mysql/private/sql_view.h @@ -177,29 +177,29 @@ include/mysql/private/sql_view.h
177include/mysql/private/sql_yacc.h 177include/mysql/private/sql_yacc.h
178include/mysql/private/strfunc.h 178include/mysql/private/strfunc.h
179include/mysql/private/structs.h 179include/mysql/private/structs.h
180include/mysql/private/sys_vars.h 180include/mysql/private/sys_vars.h
181include/mysql/private/sys_vars_shared.h 181include/mysql/private/sys_vars_shared.h
182include/mysql/private/table.h 182include/mysql/private/table.h
183include/mysql/private/thr_malloc.h 183include/mysql/private/thr_malloc.h
184include/mysql/private/threadpool.h 184include/mysql/private/threadpool.h
185include/mysql/private/transaction.h 185include/mysql/private/transaction.h
186include/mysql/private/tzfile.h 186include/mysql/private/tzfile.h
187include/mysql/private/tztime.h 187include/mysql/private/tztime.h
188include/mysql/private/unireg.h 188include/mysql/private/unireg.h
189include/mysql/private/winservice.h 189include/mysql/private/winservice.h
190lib/libmysqld.a 190${PLIST.embedded}lib/libmysqld.a
191lib/libmysqld.so 191${PLIST.embedded}lib/libmysqld.so
192lib/libmysqld.so.18 192${PLIST.embedded}lib/libmysqld.so.18
193lib/libmysqlservices.a 193lib/libmysqlservices.a
194lib/mysql/plugin/adt_null.so 194lib/mysql/plugin/adt_null.so
195lib/mysql/plugin/auth_0x0100.so 195lib/mysql/plugin/auth_0x0100.so
196lib/mysql/plugin/auth_pam.so 196lib/mysql/plugin/auth_pam.so
197lib/mysql/plugin/auth_test_plugin.so 197lib/mysql/plugin/auth_test_plugin.so
198lib/mysql/plugin/daemon_example.ini 198lib/mysql/plugin/daemon_example.ini
199lib/mysql/plugin/dialog.so 199lib/mysql/plugin/dialog.so
200lib/mysql/plugin/dialog_examples.so 200lib/mysql/plugin/dialog_examples.so
201lib/mysql/plugin/feedback.so 201lib/mysql/plugin/feedback.so
202lib/mysql/plugin/ha_archive.so 202lib/mysql/plugin/ha_archive.so
203lib/mysql/plugin/ha_blackhole.so 203lib/mysql/plugin/ha_blackhole.so
204lib/mysql/plugin/ha_example.so 204lib/mysql/plugin/ha_example.so
205lib/mysql/plugin/ha_federated.so 205lib/mysql/plugin/ha_federated.so
@@ -513,26 +513,27 @@ share/mariadb/test/include/ctype_common. @@ -513,26 +513,27 @@ share/mariadb/test/include/ctype_common.
513share/mariadb/test/include/ctype_czech.inc 513share/mariadb/test/include/ctype_czech.inc
514share/mariadb/test/include/ctype_datetime.inc 514share/mariadb/test/include/ctype_datetime.inc
515share/mariadb/test/include/ctype_filesort.inc 515share/mariadb/test/include/ctype_filesort.inc
516share/mariadb/test/include/ctype_filesort2.inc 516share/mariadb/test/include/ctype_filesort2.inc
517share/mariadb/test/include/ctype_german.inc 517share/mariadb/test/include/ctype_german.inc
518share/mariadb/test/include/ctype_innodb_like.inc 518share/mariadb/test/include/ctype_innodb_like.inc
519share/mariadb/test/include/ctype_like.inc 519share/mariadb/test/include/ctype_like.inc
520share/mariadb/test/include/ctype_like_escape.inc 520share/mariadb/test/include/ctype_like_escape.inc
521share/mariadb/test/include/ctype_like_ignorable.inc 521share/mariadb/test/include/ctype_like_ignorable.inc
522share/mariadb/test/include/ctype_like_range_f1f2.inc 522share/mariadb/test/include/ctype_like_range_f1f2.inc
523share/mariadb/test/include/ctype_numconv.inc 523share/mariadb/test/include/ctype_numconv.inc
524share/mariadb/test/include/ctype_regex.inc 524share/mariadb/test/include/ctype_regex.inc
525share/mariadb/test/include/ctype_str_to_date.inc 525share/mariadb/test/include/ctype_str_to_date.inc
 526share/mariadb/test/include/ctype_utf8_ilseq.inc
526share/mariadb/test/include/ctype_utf8_table.inc 527share/mariadb/test/include/ctype_utf8_table.inc
527share/mariadb/test/include/ctype_utf8mb4.inc 528share/mariadb/test/include/ctype_utf8mb4.inc
528share/mariadb/test/include/daemon_example_bad_format.ini 529share/mariadb/test/include/daemon_example_bad_format.ini
529share/mariadb/test/include/daemon_example_bad_soname.ini 530share/mariadb/test/include/daemon_example_bad_soname.ini
530share/mariadb/test/include/dbt3_s001.inc 531share/mariadb/test/include/dbt3_s001.inc
531share/mariadb/test/include/ddl_i18n.check_events.inc 532share/mariadb/test/include/ddl_i18n.check_events.inc
532share/mariadb/test/include/ddl_i18n.check_sp.inc 533share/mariadb/test/include/ddl_i18n.check_sp.inc
533share/mariadb/test/include/ddl_i18n.check_triggers.inc 534share/mariadb/test/include/ddl_i18n.check_triggers.inc
534share/mariadb/test/include/ddl_i18n.check_views.inc 535share/mariadb/test/include/ddl_i18n.check_views.inc
535share/mariadb/test/include/deadlock.inc 536share/mariadb/test/include/deadlock.inc
536share/mariadb/test/include/default_client.cnf 537share/mariadb/test/include/default_client.cnf
537share/mariadb/test/include/default_my.cnf 538share/mariadb/test/include/default_my.cnf
538share/mariadb/test/include/default_mysqld.cnf 539share/mariadb/test/include/default_mysqld.cnf
@@ -1112,26 +1113,27 @@ share/mariadb/test/r/ctype_gbk_binlog.re @@ -1112,26 +1113,27 @@ share/mariadb/test/r/ctype_gbk_binlog.re
1112share/mariadb/test/r/ctype_hebrew.result 1113share/mariadb/test/r/ctype_hebrew.result
1113share/mariadb/test/r/ctype_latin1.result 1114share/mariadb/test/r/ctype_latin1.result
1114share/mariadb/test/r/ctype_latin1_de.result 1115share/mariadb/test/r/ctype_latin1_de.result
1115share/mariadb/test/r/ctype_latin2.result 1116share/mariadb/test/r/ctype_latin2.result
1116share/mariadb/test/r/ctype_latin2_ch.result 1117share/mariadb/test/r/ctype_latin2_ch.result
1117share/mariadb/test/r/ctype_ldml.result 1118share/mariadb/test/r/ctype_ldml.result
1118share/mariadb/test/r/ctype_like_range.result 1119share/mariadb/test/r/ctype_like_range.result
1119share/mariadb/test/r/ctype_many.result 1120share/mariadb/test/r/ctype_many.result
1120share/mariadb/test/r/ctype_mb.result 1121share/mariadb/test/r/ctype_mb.result
1121share/mariadb/test/r/ctype_recoding.result 1122share/mariadb/test/r/ctype_recoding.result
1122share/mariadb/test/r/ctype_sjis.result 1123share/mariadb/test/r/ctype_sjis.result
1123share/mariadb/test/r/ctype_tis620.result 1124share/mariadb/test/r/ctype_tis620.result
1124share/mariadb/test/r/ctype_uca.result 1125share/mariadb/test/r/ctype_uca.result
 1126share/mariadb/test/r/ctype_uca_innodb.result
1125share/mariadb/test/r/ctype_ucs.result 1127share/mariadb/test/r/ctype_ucs.result
1126share/mariadb/test/r/ctype_ucs2_def.result 1128share/mariadb/test/r/ctype_ucs2_def.result
1127share/mariadb/test/r/ctype_ucs2_query_cache.result 1129share/mariadb/test/r/ctype_ucs2_query_cache.result
1128share/mariadb/test/r/ctype_ujis.result 1130share/mariadb/test/r/ctype_ujis.result
1129share/mariadb/test/r/ctype_ujis_ucs2.result 1131share/mariadb/test/r/ctype_ujis_ucs2.result
1130share/mariadb/test/r/ctype_utf16.result 1132share/mariadb/test/r/ctype_utf16.result
1131share/mariadb/test/r/ctype_utf16_def.result 1133share/mariadb/test/r/ctype_utf16_def.result
1132share/mariadb/test/r/ctype_utf16_uca.result 1134share/mariadb/test/r/ctype_utf16_uca.result
1133share/mariadb/test/r/ctype_utf32.result 1135share/mariadb/test/r/ctype_utf32.result
1134share/mariadb/test/r/ctype_utf32_uca.result 1136share/mariadb/test/r/ctype_utf32_uca.result
1135share/mariadb/test/r/ctype_utf8.result 1137share/mariadb/test/r/ctype_utf8.result
1136share/mariadb/test/r/ctype_utf8mb4.result 1138share/mariadb/test/r/ctype_utf8mb4.result
1137share/mariadb/test/r/ctype_utf8mb4_heap.result 1139share/mariadb/test/r/ctype_utf8mb4_heap.result
@@ -1173,26 +1175,27 @@ share/mariadb/test/r/events_logs_tests.r @@ -1173,26 +1175,27 @@ share/mariadb/test/r/events_logs_tests.r
1173share/mariadb/test/r/events_microsec.result 1175share/mariadb/test/r/events_microsec.result
1174share/mariadb/test/r/events_restart.result 1176share/mariadb/test/r/events_restart.result
1175share/mariadb/test/r/events_scheduling.result 1177share/mariadb/test/r/events_scheduling.result
1176share/mariadb/test/r/events_stress.result 1178share/mariadb/test/r/events_stress.result
1177share/mariadb/test/r/events_time_zone.result 1179share/mariadb/test/r/events_time_zone.result
1178share/mariadb/test/r/events_trans.result 1180share/mariadb/test/r/events_trans.result
1179share/mariadb/test/r/events_trans_notembedded.result 1181share/mariadb/test/r/events_trans_notembedded.result
1180share/mariadb/test/r/execution_constants.result 1182share/mariadb/test/r/execution_constants.result
1181share/mariadb/test/r/explain.result 1183share/mariadb/test/r/explain.result
1182share/mariadb/test/r/failed_auth_3909.result 1184share/mariadb/test/r/failed_auth_3909.result
1183share/mariadb/test/r/failed_auth_unixsocket.result 1185share/mariadb/test/r/failed_auth_unixsocket.result
1184share/mariadb/test/r/features.result 1186share/mariadb/test/r/features.result
1185share/mariadb/test/r/file_contents.result 1187share/mariadb/test/r/file_contents.result
 1188share/mariadb/test/r/filesort_bad_i_s-7585.result
1186share/mariadb/test/r/filesort_debug.result 1189share/mariadb/test/r/filesort_debug.result
1187share/mariadb/test/r/fix_priv_tables.result 1190share/mariadb/test/r/fix_priv_tables.result
1188share/mariadb/test/r/flush-innodb.result 1191share/mariadb/test/r/flush-innodb.result
1189share/mariadb/test/r/flush.result 1192share/mariadb/test/r/flush.result
1190share/mariadb/test/r/flush2.result 1193share/mariadb/test/r/flush2.result
1191share/mariadb/test/r/flush_block_commit.result 1194share/mariadb/test/r/flush_block_commit.result
1192share/mariadb/test/r/flush_block_commit_notembedded.result 1195share/mariadb/test/r/flush_block_commit_notembedded.result
1193share/mariadb/test/r/flush_read_lock.result 1196share/mariadb/test/r/flush_read_lock.result
1194share/mariadb/test/r/flush_read_lock_kill.result 1197share/mariadb/test/r/flush_read_lock_kill.result
1195share/mariadb/test/r/flush_table.result 1198share/mariadb/test/r/flush_table.result
1196share/mariadb/test/r/foreign_key.result 1199share/mariadb/test/r/foreign_key.result
1197share/mariadb/test/r/frm_bad_row_type-7333.result 1200share/mariadb/test/r/frm_bad_row_type-7333.result
1198share/mariadb/test/r/fulltext.result 1201share/mariadb/test/r/fulltext.result
@@ -1423,26 +1426,27 @@ share/mariadb/test/r/mysql.result @@ -1423,26 +1426,27 @@ share/mariadb/test/r/mysql.result
1423share/mariadb/test/r/mysql_binary_mode.result 1426share/mariadb/test/r/mysql_binary_mode.result
1424share/mariadb/test/r/mysql_client_test.result 1427share/mariadb/test/r/mysql_client_test.result
1425share/mariadb/test/r/mysql_client_test_nonblock.result 1428share/mariadb/test/r/mysql_client_test_nonblock.result
1426share/mariadb/test/r/mysql_comments.result 1429share/mariadb/test/r/mysql_comments.result
1427share/mariadb/test/r/mysql_cp932.result 1430share/mariadb/test/r/mysql_cp932.result
1428share/mariadb/test/r/mysql_embedded.result 1431share/mariadb/test/r/mysql_embedded.result
1429share/mariadb/test/r/mysql_locale_posix.result 1432share/mariadb/test/r/mysql_locale_posix.result
1430share/mariadb/test/r/mysql_not_windows.result 1433share/mariadb/test/r/mysql_not_windows.result
1431share/mariadb/test/r/mysql_plugin.result 1434share/mariadb/test/r/mysql_plugin.result
1432share/mariadb/test/r/mysql_protocols.result 1435share/mariadb/test/r/mysql_protocols.result
1433share/mariadb/test/r/mysql_tzinfo_to_sql_symlink.result 1436share/mariadb/test/r/mysql_tzinfo_to_sql_symlink.result
1434share/mariadb/test/r/mysql_upgrade.result 1437share/mariadb/test/r/mysql_upgrade.result
1435share/mariadb/test/r/mysql_upgrade_ssl.result 1438share/mariadb/test/r/mysql_upgrade_ssl.result
 1439share/mariadb/test/r/mysql_upgrade_view.result
1436share/mariadb/test/r/mysqladmin.result 1440share/mariadb/test/r/mysqladmin.result
1437share/mariadb/test/r/mysqlbinlog-innodb.result 1441share/mariadb/test/r/mysqlbinlog-innodb.result
1438share/mariadb/test/r/mysqlbinlog.result 1442share/mariadb/test/r/mysqlbinlog.result
1439share/mariadb/test/r/mysqlbinlog_row_big.result 1443share/mariadb/test/r/mysqlbinlog_row_big.result
1440share/mariadb/test/r/mysqlcheck.result 1444share/mariadb/test/r/mysqlcheck.result
1441share/mariadb/test/r/mysqld--defaults-file.result 1445share/mariadb/test/r/mysqld--defaults-file.result
1442share/mariadb/test/r/mysqld--help,win.rdiff 1446share/mariadb/test/r/mysqld--help,win.rdiff
1443share/mariadb/test/r/mysqld--help.result 1447share/mariadb/test/r/mysqld--help.result
1444share/mariadb/test/r/mysqld_option_err.result 1448share/mariadb/test/r/mysqld_option_err.result
1445share/mariadb/test/r/mysqldump-compat.result 1449share/mariadb/test/r/mysqldump-compat.result
1446share/mariadb/test/r/mysqldump-max.result 1450share/mariadb/test/r/mysqldump-max.result
1447share/mariadb/test/r/mysqldump-no-binlog.result 1451share/mariadb/test/r/mysqldump-no-binlog.result
1448share/mariadb/test/r/mysqldump.result 1452share/mariadb/test/r/mysqldump.result
@@ -1697,26 +1701,27 @@ share/mariadb/test/r/subselect_sj_nonmer @@ -1697,26 +1701,27 @@ share/mariadb/test/r/subselect_sj_nonmer
1697share/mariadb/test/r/sum_distinct-big.result 1701share/mariadb/test/r/sum_distinct-big.result
1698share/mariadb/test/r/sum_distinct.result 1702share/mariadb/test/r/sum_distinct.result
1699share/mariadb/test/r/symlink.result 1703share/mariadb/test/r/symlink.result
1700share/mariadb/test/r/synchronization.result 1704share/mariadb/test/r/synchronization.result
1701share/mariadb/test/r/sysdate_is_now.result 1705share/mariadb/test/r/sysdate_is_now.result
1702share/mariadb/test/r/system_mysql_db.result 1706share/mariadb/test/r/system_mysql_db.result
1703share/mariadb/test/r/system_mysql_db_fix30020.result 1707share/mariadb/test/r/system_mysql_db_fix30020.result
1704share/mariadb/test/r/system_mysql_db_fix40123.result 1708share/mariadb/test/r/system_mysql_db_fix40123.result
1705share/mariadb/test/r/system_mysql_db_fix50030.result 1709share/mariadb/test/r/system_mysql_db_fix50030.result
1706share/mariadb/test/r/system_mysql_db_fix50117.result 1710share/mariadb/test/r/system_mysql_db_fix50117.result
1707share/mariadb/test/r/system_mysql_db_refs.result 1711share/mariadb/test/r/system_mysql_db_refs.result
1708share/mariadb/test/r/table_elim.result 1712share/mariadb/test/r/table_elim.result
1709share/mariadb/test/r/table_elim_debug.result 1713share/mariadb/test/r/table_elim_debug.result
 1714share/mariadb/test/r/table_keyinfo-6838.result
1710share/mariadb/test/r/table_options.result 1715share/mariadb/test/r/table_options.result
1711share/mariadb/test/r/tablelock.result 1716share/mariadb/test/r/tablelock.result
1712share/mariadb/test/r/tablespace.result 1717share/mariadb/test/r/tablespace.result
1713share/mariadb/test/r/temp_table.result 1718share/mariadb/test/r/temp_table.result
1714share/mariadb/test/r/temporal_scale_4283.result 1719share/mariadb/test/r/temporal_scale_4283.result
1715share/mariadb/test/r/testdb_only.require 1720share/mariadb/test/r/testdb_only.require
1716share/mariadb/test/r/timezone.result 1721share/mariadb/test/r/timezone.result
1717share/mariadb/test/r/timezone2.result 1722share/mariadb/test/r/timezone2.result
1718share/mariadb/test/r/timezone3.result 1723share/mariadb/test/r/timezone3.result
1719share/mariadb/test/r/timezone4.result 1724share/mariadb/test/r/timezone4.result
1720share/mariadb/test/r/timezone_grant.result 1725share/mariadb/test/r/timezone_grant.result
1721share/mariadb/test/r/trigger-compat.result 1726share/mariadb/test/r/trigger-compat.result
1722share/mariadb/test/r/trigger-trans.result 1727share/mariadb/test/r/trigger-trans.result
@@ -1743,26 +1748,27 @@ share/mariadb/test/r/type_set.result @@ -1743,26 +1748,27 @@ share/mariadb/test/r/type_set.result
1743share/mariadb/test/r/type_time.result 1748share/mariadb/test/r/type_time.result
1744share/mariadb/test/r/type_time_hires.result 1749share/mariadb/test/r/type_time_hires.result
1745share/mariadb/test/r/type_timestamp.result 1750share/mariadb/test/r/type_timestamp.result
1746share/mariadb/test/r/type_timestamp_hires.result 1751share/mariadb/test/r/type_timestamp_hires.result
1747share/mariadb/test/r/type_uint.result 1752share/mariadb/test/r/type_uint.result
1748share/mariadb/test/r/type_varchar.result 1753share/mariadb/test/r/type_varchar.result
1749share/mariadb/test/r/type_year.result 1754share/mariadb/test/r/type_year.result
1750share/mariadb/test/r/udf.result 1755share/mariadb/test/r/udf.result
1751share/mariadb/test/r/udf_debug_sync.result 1756share/mariadb/test/r/udf_debug_sync.result
1752share/mariadb/test/r/udf_query_cache.result 1757share/mariadb/test/r/udf_query_cache.result
1753share/mariadb/test/r/udf_skip_grants.result 1758share/mariadb/test/r/udf_skip_grants.result
1754share/mariadb/test/r/union.result 1759share/mariadb/test/r/union.result
1755share/mariadb/test/r/union_crash-714.result 1760share/mariadb/test/r/union_crash-714.result
 1761share/mariadb/test/r/uniques_crash-7912.result
1756share/mariadb/test/r/unsafe_binlog_innodb.result 1762share/mariadb/test/r/unsafe_binlog_innodb.result
1757share/mariadb/test/r/update.result 1763share/mariadb/test/r/update.result
1758share/mariadb/test/r/update_ignore_216.result 1764share/mariadb/test/r/update_ignore_216.result
1759share/mariadb/test/r/upgrade.result 1765share/mariadb/test/r/upgrade.result
1760share/mariadb/test/r/user_limits.result 1766share/mariadb/test/r/user_limits.result
1761share/mariadb/test/r/user_var-binlog.result 1767share/mariadb/test/r/user_var-binlog.result
1762share/mariadb/test/r/user_var.result 1768share/mariadb/test/r/user_var.result
1763share/mariadb/test/r/userstat-badlogin-4824.result 1769share/mariadb/test/r/userstat-badlogin-4824.result
1764share/mariadb/test/r/varbinary.result 1770share/mariadb/test/r/varbinary.result
1765share/mariadb/test/r/variables-notembedded.result 1771share/mariadb/test/r/variables-notembedded.result
1766share/mariadb/test/r/variables.result 1772share/mariadb/test/r/variables.result
1767share/mariadb/test/r/variables_community.result 1773share/mariadb/test/r/variables_community.result
1768share/mariadb/test/r/view.result 1774share/mariadb/test/r/view.result
@@ -1866,26 +1872,34 @@ share/mariadb/test/std_data/loaddata7.da @@ -1866,26 +1872,34 @@ share/mariadb/test/std_data/loaddata7.da
1866share/mariadb/test/std_data/loaddata_dq.dat 1872share/mariadb/test/std_data/loaddata_dq.dat
1867share/mariadb/test/std_data/loaddata_pair.dat 1873share/mariadb/test/std_data/loaddata_pair.dat
1868share/mariadb/test/std_data/loaddata_utf8.dat 1874share/mariadb/test/std_data/loaddata_utf8.dat
1869share/mariadb/test/std_data/loadxml.dat 1875share/mariadb/test/std_data/loadxml.dat
1870share/mariadb/test/std_data/loadxml2.dat 1876share/mariadb/test/std_data/loadxml2.dat
1871share/mariadb/test/std_data/long_table_name.MYD 1877share/mariadb/test/std_data/long_table_name.MYD
1872share/mariadb/test/std_data/long_table_name.MYI 1878share/mariadb/test/std_data/long_table_name.MYI
1873share/mariadb/test/std_data/long_table_name.frm 1879share/mariadb/test/std_data/long_table_name.frm
1874share/mariadb/test/std_data/master-bin.000001 1880share/mariadb/test/std_data/master-bin.000001
1875share/mariadb/test/std_data/mdev5029_1.frm 1881share/mariadb/test/std_data/mdev5029_1.frm
1876share/mariadb/test/std_data/mdev5029_2.MAD 1882share/mariadb/test/std_data/mdev5029_2.MAD
1877share/mariadb/test/std_data/mdev5029_2.MAI 1883share/mariadb/test/std_data/mdev5029_2.MAI
1878share/mariadb/test/std_data/mdev5029_2.frm 1884share/mariadb/test/std_data/mdev5029_2.frm
 1885share/mariadb/test/std_data/mysql_upgrade/event.MYD
 1886share/mariadb/test/std_data/mysql_upgrade/event.MYI
 1887share/mariadb/test/std_data/mysql_upgrade/event.frm
 1888share/mariadb/test/std_data/mysql_upgrade/v1.frm
 1889share/mariadb/test/std_data/mysql_upgrade/v1badcheck.frm
 1890share/mariadb/test/std_data/mysql_upgrade/v2.frm
 1891share/mariadb/test/std_data/mysql_upgrade/v3.frm
 1892share/mariadb/test/std_data/mysql_upgrade/v4.frm
1879share/mariadb/test/std_data/ndb_backup50/BACKUP-1-0.1.Data 1893share/mariadb/test/std_data/ndb_backup50/BACKUP-1-0.1.Data
1880share/mariadb/test/std_data/ndb_backup50/BACKUP-1-0.2.Data 1894share/mariadb/test/std_data/ndb_backup50/BACKUP-1-0.2.Data
1881share/mariadb/test/std_data/ndb_backup50/BACKUP-1.1.ctl 1895share/mariadb/test/std_data/ndb_backup50/BACKUP-1.1.ctl
1882share/mariadb/test/std_data/ndb_backup50/BACKUP-1.1.log 1896share/mariadb/test/std_data/ndb_backup50/BACKUP-1.1.log
1883share/mariadb/test/std_data/ndb_backup50/BACKUP-1.2.ctl 1897share/mariadb/test/std_data/ndb_backup50/BACKUP-1.2.ctl
1884share/mariadb/test/std_data/ndb_backup50/BACKUP-1.2.log 1898share/mariadb/test/std_data/ndb_backup50/BACKUP-1.2.log
1885share/mariadb/test/std_data/ndb_backup50/BACKUP-2-0.1.Data 1899share/mariadb/test/std_data/ndb_backup50/BACKUP-2-0.1.Data
1886share/mariadb/test/std_data/ndb_backup50/BACKUP-2-0.2.Data 1900share/mariadb/test/std_data/ndb_backup50/BACKUP-2-0.2.Data
1887share/mariadb/test/std_data/ndb_backup50/BACKUP-2.1.ctl 1901share/mariadb/test/std_data/ndb_backup50/BACKUP-2.1.ctl
1888share/mariadb/test/std_data/ndb_backup50/BACKUP-2.1.log 1902share/mariadb/test/std_data/ndb_backup50/BACKUP-2.1.log
1889share/mariadb/test/std_data/ndb_backup50/BACKUP-2.2.ctl 1903share/mariadb/test/std_data/ndb_backup50/BACKUP-2.2.ctl
1890share/mariadb/test/std_data/ndb_backup50/BACKUP-2.2.log 1904share/mariadb/test/std_data/ndb_backup50/BACKUP-2.2.log
1891share/mariadb/test/std_data/ndb_backup51/BACKUP-1-0.1.Data 1905share/mariadb/test/std_data/ndb_backup51/BACKUP-1-0.1.Data
@@ -2031,26 +2045,27 @@ share/mariadb/test/suite/binlog/r/binlog @@ -2031,26 +2045,27 @@ share/mariadb/test/suite/binlog/r/binlog
2031share/mariadb/test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result 2045share/mariadb/test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
2032share/mariadb/test/suite/binlog/r/binlog_stm_ps.result 2046share/mariadb/test/suite/binlog/r/binlog_stm_ps.result
2033share/mariadb/test/suite/binlog/r/binlog_stm_row.result 2047share/mariadb/test/suite/binlog/r/binlog_stm_row.result
2034share/mariadb/test/suite/binlog/r/binlog_stm_unsafe_warning.result 2048share/mariadb/test/suite/binlog/r/binlog_stm_unsafe_warning.result
2035share/mariadb/test/suite/binlog/r/binlog_stm_user_variables.result 2049share/mariadb/test/suite/binlog/r/binlog_stm_user_variables.result
2036share/mariadb/test/suite/binlog/r/binlog_switch_inside_trans.result 2050share/mariadb/test/suite/binlog/r/binlog_switch_inside_trans.result
2037share/mariadb/test/suite/binlog/r/binlog_tmp_table.result 2051share/mariadb/test/suite/binlog/r/binlog_tmp_table.result
2038share/mariadb/test/suite/binlog/r/binlog_truncate_innodb.result 2052share/mariadb/test/suite/binlog/r/binlog_truncate_innodb.result
2039share/mariadb/test/suite/binlog/r/binlog_truncate_kill.result 2053share/mariadb/test/suite/binlog/r/binlog_truncate_kill.result
2040share/mariadb/test/suite/binlog/r/binlog_truncate_myisam.result 2054share/mariadb/test/suite/binlog/r/binlog_truncate_myisam.result
2041share/mariadb/test/suite/binlog/r/binlog_unsafe.result 2055share/mariadb/test/suite/binlog/r/binlog_unsafe.result
2042share/mariadb/test/suite/binlog/r/binlog_write_error.result 2056share/mariadb/test/suite/binlog/r/binlog_write_error.result
2043share/mariadb/test/suite/binlog/r/load_data_stm_view.result 2057share/mariadb/test/suite/binlog/r/load_data_stm_view.result
 2058share/mariadb/test/suite/binlog/r/temptable_uservar_disconnect-7938.result
2044share/mariadb/test/suite/binlog/std_data/binlog_old_version_4_1.000001 2059share/mariadb/test/suite/binlog/std_data/binlog_old_version_4_1.000001
2045share/mariadb/test/suite/binlog/std_data/bug32407.001 2060share/mariadb/test/suite/binlog/std_data/bug32407.001
2046share/mariadb/test/suite/binlog/std_data/update-full-row.binlog 2061share/mariadb/test/suite/binlog/std_data/update-full-row.binlog
2047share/mariadb/test/suite/binlog/std_data/update-partial-row.binlog 2062share/mariadb/test/suite/binlog/std_data/update-partial-row.binlog
2048share/mariadb/test/suite/binlog/std_data/ver_5_1-telco.001 2063share/mariadb/test/suite/binlog/std_data/ver_5_1-telco.001
2049share/mariadb/test/suite/binlog/std_data/ver_5_1-wl2325_r.001 2064share/mariadb/test/suite/binlog/std_data/ver_5_1-wl2325_r.001
2050share/mariadb/test/suite/binlog/std_data/ver_5_1-wl2325_s.001 2065share/mariadb/test/suite/binlog/std_data/ver_5_1-wl2325_s.001
2051share/mariadb/test/suite/binlog/std_data/ver_5_1_17.001 2066share/mariadb/test/suite/binlog/std_data/ver_5_1_17.001
2052share/mariadb/test/suite/binlog/std_data/ver_5_1_23.001 2067share/mariadb/test/suite/binlog/std_data/ver_5_1_23.001
2053share/mariadb/test/suite/binlog/std_data/write-full-row.binlog 2068share/mariadb/test/suite/binlog/std_data/write-full-row.binlog
2054share/mariadb/test/suite/binlog/std_data/write-partial-row.binlog 2069share/mariadb/test/suite/binlog/std_data/write-partial-row.binlog
2055share/mariadb/test/suite/binlog/t/binlog_base64_flag.test 2070share/mariadb/test/suite/binlog/t/binlog_base64_flag.test
2056share/mariadb/test/suite/binlog/t/binlog_bug23533.test 2071share/mariadb/test/suite/binlog/t/binlog_bug23533.test
@@ -2140,26 +2155,27 @@ share/mariadb/test/suite/binlog/t/binlog @@ -2140,26 +2155,27 @@ share/mariadb/test/suite/binlog/t/binlog
2140share/mariadb/test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt 2155share/mariadb/test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt
2141share/mariadb/test/suite/binlog/t/binlog_stm_unsafe_warning.test 2156share/mariadb/test/suite/binlog/t/binlog_stm_unsafe_warning.test
2142share/mariadb/test/suite/binlog/t/binlog_stm_user_variables.test 2157share/mariadb/test/suite/binlog/t/binlog_stm_user_variables.test
2143share/mariadb/test/suite/binlog/t/binlog_switch_inside_trans.test 2158share/mariadb/test/suite/binlog/t/binlog_switch_inside_trans.test
2144share/mariadb/test/suite/binlog/t/binlog_tmp_table.test 2159share/mariadb/test/suite/binlog/t/binlog_tmp_table.test
2145share/mariadb/test/suite/binlog/t/binlog_truncate_innodb-master.opt 2160share/mariadb/test/suite/binlog/t/binlog_truncate_innodb-master.opt
2146share/mariadb/test/suite/binlog/t/binlog_truncate_innodb.test 2161share/mariadb/test/suite/binlog/t/binlog_truncate_innodb.test
2147share/mariadb/test/suite/binlog/t/binlog_truncate_kill.test 2162share/mariadb/test/suite/binlog/t/binlog_truncate_kill.test
2148share/mariadb/test/suite/binlog/t/binlog_truncate_myisam.test 2163share/mariadb/test/suite/binlog/t/binlog_truncate_myisam.test
2149share/mariadb/test/suite/binlog/t/binlog_unsafe-master.opt 2164share/mariadb/test/suite/binlog/t/binlog_unsafe-master.opt
2150share/mariadb/test/suite/binlog/t/binlog_unsafe.test 2165share/mariadb/test/suite/binlog/t/binlog_unsafe.test
2151share/mariadb/test/suite/binlog/t/binlog_write_error.test 2166share/mariadb/test/suite/binlog/t/binlog_write_error.test
2152share/mariadb/test/suite/binlog/t/load_data_stm_view.test 2167share/mariadb/test/suite/binlog/t/load_data_stm_view.test
 2168share/mariadb/test/suite/binlog/t/temptable_uservar_disconnect-7938.test
2153share/mariadb/test/suite/csv/csv.result 2169share/mariadb/test/suite/csv/csv.result
2154share/mariadb/test/suite/csv/csv.test 2170share/mariadb/test/suite/csv/csv.test
2155share/mariadb/test/suite/csv/csv_alter_table.result 2171share/mariadb/test/suite/csv/csv_alter_table.result
2156share/mariadb/test/suite/csv/csv_alter_table.test 2172share/mariadb/test/suite/csv/csv_alter_table.test
2157share/mariadb/test/suite/csv/csv_not_null.result 2173share/mariadb/test/suite/csv/csv_not_null.result
2158share/mariadb/test/suite/csv/csv_not_null.test 2174share/mariadb/test/suite/csv/csv_not_null.test
2159share/mariadb/test/suite/engines/README 2175share/mariadb/test/suite/engines/README
2160share/mariadb/test/suite/engines/funcs/disabled.def 2176share/mariadb/test/suite/engines/funcs/disabled.def
2161share/mariadb/test/suite/engines/funcs/r/ai_init_alter_table.result 2177share/mariadb/test/suite/engines/funcs/r/ai_init_alter_table.result
2162share/mariadb/test/suite/engines/funcs/r/ai_init_create_table.result 2178share/mariadb/test/suite/engines/funcs/r/ai_init_create_table.result
2163share/mariadb/test/suite/engines/funcs/r/ai_init_insert.result 2179share/mariadb/test/suite/engines/funcs/r/ai_init_insert.result
2164share/mariadb/test/suite/engines/funcs/r/ai_init_insert_id.result 2180share/mariadb/test/suite/engines/funcs/r/ai_init_insert_id.result
2165share/mariadb/test/suite/engines/funcs/r/ai_overflow_error.result 2181share/mariadb/test/suite/engines/funcs/r/ai_overflow_error.result
@@ -3497,27 +3513,26 @@ share/mariadb/test/suite/innodb/r/innodb @@ -3497,27 +3513,26 @@ share/mariadb/test/suite/innodb/r/innodb
3497share/mariadb/test/suite/innodb/r/innodb-autoinc-44030.result 3513share/mariadb/test/suite/innodb/r/innodb-autoinc-44030.result
3498share/mariadb/test/suite/innodb/r/innodb-autoinc-56228.result 3514share/mariadb/test/suite/innodb/r/innodb-autoinc-56228.result
3499share/mariadb/test/suite/innodb/r/innodb-autoinc-61209.result 3515share/mariadb/test/suite/innodb/r/innodb-autoinc-61209.result
3500share/mariadb/test/suite/innodb/r/innodb-autoinc-optimize.result 3516share/mariadb/test/suite/innodb/r/innodb-autoinc-optimize.result
3501share/mariadb/test/suite/innodb/r/innodb-autoinc.result 3517share/mariadb/test/suite/innodb/r/innodb-autoinc.result
3502share/mariadb/test/suite/innodb/r/innodb-blob.result 3518share/mariadb/test/suite/innodb/r/innodb-blob.result
3503share/mariadb/test/suite/innodb/r/innodb-change-buffer-recovery.result 3519share/mariadb/test/suite/innodb/r/innodb-change-buffer-recovery.result
3504share/mariadb/test/suite/innodb/r/innodb-changed-pages.result 3520share/mariadb/test/suite/innodb/r/innodb-changed-pages.result
3505share/mariadb/test/suite/innodb/r/innodb-consistent.result 3521share/mariadb/test/suite/innodb/r/innodb-consistent.result
3506share/mariadb/test/suite/innodb/r/innodb-fk.result 3522share/mariadb/test/suite/innodb/r/innodb-fk.result
3507share/mariadb/test/suite/innodb/r/innodb-index.result 3523share/mariadb/test/suite/innodb/r/innodb-index.result
3508share/mariadb/test/suite/innodb/r/innodb-index_ucs2.result 3524share/mariadb/test/suite/innodb/r/innodb-index_ucs2.result
3509share/mariadb/test/suite/innodb/r/innodb-lock.result 3525share/mariadb/test/suite/innodb/r/innodb-lock.result
3510share/mariadb/test/suite/innodb/r/innodb-mdev-7055.result 
3511share/mariadb/test/suite/innodb/r/innodb-mdev-7513.result 3526share/mariadb/test/suite/innodb/r/innodb-mdev-7513.result
3512share/mariadb/test/suite/innodb/r/innodb-replace.result 3527share/mariadb/test/suite/innodb/r/innodb-replace.result
3513share/mariadb/test/suite/innodb/r/innodb-semi-consistent.result 3528share/mariadb/test/suite/innodb/r/innodb-semi-consistent.result
3514share/mariadb/test/suite/innodb/r/innodb-stats-sample.result 3529share/mariadb/test/suite/innodb/r/innodb-stats-sample.result
3515share/mariadb/test/suite/innodb/r/innodb-timeout.result 3530share/mariadb/test/suite/innodb/r/innodb-timeout.result
3516share/mariadb/test/suite/innodb/r/innodb-truncate.result 3531share/mariadb/test/suite/innodb/r/innodb-truncate.result
3517share/mariadb/test/suite/innodb/r/innodb-ucs2.result 3532share/mariadb/test/suite/innodb/r/innodb-ucs2.result
3518share/mariadb/test/suite/innodb/r/innodb-update-insert.result 3533share/mariadb/test/suite/innodb/r/innodb-update-insert.result
3519share/mariadb/test/suite/innodb/r/innodb.result 3534share/mariadb/test/suite/innodb/r/innodb.result
3520share/mariadb/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result 3535share/mariadb/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
3521share/mariadb/test/suite/innodb/r/innodb_bug11754376.result 3536share/mariadb/test/suite/innodb/r/innodb_bug11754376.result
3522share/mariadb/test/suite/innodb/r/innodb_bug11766634.result 3537share/mariadb/test/suite/innodb/r/innodb_bug11766634.result
3523share/mariadb/test/suite/innodb/r/innodb_bug12400341.result 3538share/mariadb/test/suite/innodb/r/innodb_bug12400341.result
@@ -3628,27 +3643,26 @@ share/mariadb/test/suite/innodb/t/innodb @@ -3628,27 +3643,26 @@ share/mariadb/test/suite/innodb/t/innodb
3628share/mariadb/test/suite/innodb/t/innodb-autoinc.test 3643share/mariadb/test/suite/innodb/t/innodb-autoinc.test
3629share/mariadb/test/suite/innodb/t/innodb-blob.test 3644share/mariadb/test/suite/innodb/t/innodb-blob.test
3630share/mariadb/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt 3645share/mariadb/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt
3631share/mariadb/test/suite/innodb/t/innodb-change-buffer-recovery.test 3646share/mariadb/test/suite/innodb/t/innodb-change-buffer-recovery.test
3632share/mariadb/test/suite/innodb/t/innodb-changed-pages-master.opt 3647share/mariadb/test/suite/innodb/t/innodb-changed-pages-master.opt
3633share/mariadb/test/suite/innodb/t/innodb-changed-pages.test 3648share/mariadb/test/suite/innodb/t/innodb-changed-pages.test
3634share/mariadb/test/suite/innodb/t/innodb-consistent-master.opt 3649share/mariadb/test/suite/innodb/t/innodb-consistent-master.opt
3635share/mariadb/test/suite/innodb/t/innodb-consistent.test 3650share/mariadb/test/suite/innodb/t/innodb-consistent.test
3636share/mariadb/test/suite/innodb/t/innodb-fk.test 3651share/mariadb/test/suite/innodb/t/innodb-fk.test
3637share/mariadb/test/suite/innodb/t/innodb-index.test 3652share/mariadb/test/suite/innodb/t/innodb-index.test
3638share/mariadb/test/suite/innodb/t/innodb-index_ucs2.test 3653share/mariadb/test/suite/innodb/t/innodb-index_ucs2.test
3639share/mariadb/test/suite/innodb/t/innodb-lock.test 3654share/mariadb/test/suite/innodb/t/innodb-lock.test
3640share/mariadb/test/suite/innodb/t/innodb-master.opt 3655share/mariadb/test/suite/innodb/t/innodb-master.opt
3641share/mariadb/test/suite/innodb/t/innodb-mdev-7055.test 
3642share/mariadb/test/suite/innodb/t/innodb-mdev-7513.test 3656share/mariadb/test/suite/innodb/t/innodb-mdev-7513.test
3643share/mariadb/test/suite/innodb/t/innodb-replace.test 3657share/mariadb/test/suite/innodb/t/innodb-replace.test
3644share/mariadb/test/suite/innodb/t/innodb-semi-consistent-master.opt 3658share/mariadb/test/suite/innodb/t/innodb-semi-consistent-master.opt
3645share/mariadb/test/suite/innodb/t/innodb-semi-consistent.test 3659share/mariadb/test/suite/innodb/t/innodb-semi-consistent.test
3646share/mariadb/test/suite/innodb/t/innodb-stats-sample.test 3660share/mariadb/test/suite/innodb/t/innodb-stats-sample.test
3647share/mariadb/test/suite/innodb/t/innodb-timeout.test 3661share/mariadb/test/suite/innodb/t/innodb-timeout.test
3648share/mariadb/test/suite/innodb/t/innodb-truncate.test 3662share/mariadb/test/suite/innodb/t/innodb-truncate.test
3649share/mariadb/test/suite/innodb/t/innodb-ucs2.test 3663share/mariadb/test/suite/innodb/t/innodb-ucs2.test
3650share/mariadb/test/suite/innodb/t/innodb-update-insert.test 3664share/mariadb/test/suite/innodb/t/innodb-update-insert.test
3651share/mariadb/test/suite/innodb/t/innodb.test 3665share/mariadb/test/suite/innodb/t/innodb.test
3652share/mariadb/test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt 3666share/mariadb/test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
3653share/mariadb/test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test 3667share/mariadb/test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
3654share/mariadb/test/suite/innodb/t/innodb_bug11754376.test 3668share/mariadb/test/suite/innodb/t/innodb_bug11754376.test
@@ -5131,26 +5145,27 @@ share/mariadb/test/suite/rpl/r/rpl_show_ @@ -5131,26 +5145,27 @@ share/mariadb/test/suite/rpl/r/rpl_show_
5131share/mariadb/test/suite/rpl/r/rpl_skip_error.result 5145share/mariadb/test/suite/rpl/r/rpl_skip_error.result
5132share/mariadb/test/suite/rpl/r/rpl_skip_replication.result 5146share/mariadb/test/suite/rpl/r/rpl_skip_replication.result
5133share/mariadb/test/suite/rpl/r/rpl_slave_grp_exec.result 5147share/mariadb/test/suite/rpl/r/rpl_slave_grp_exec.result
5134share/mariadb/test/suite/rpl/r/rpl_slave_load_in.result 5148share/mariadb/test/suite/rpl/r/rpl_slave_load_in.result
5135share/mariadb/test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result 5149share/mariadb/test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
5136share/mariadb/test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result 5150share/mariadb/test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
5137share/mariadb/test/suite/rpl/r/rpl_slave_skip.result 5151share/mariadb/test/suite/rpl/r/rpl_slave_skip.result
5138share/mariadb/test/suite/rpl/r/rpl_slave_status.result 5152share/mariadb/test/suite/rpl/r/rpl_slave_status.result
5139share/mariadb/test/suite/rpl/r/rpl_slow_query_log.result 5153share/mariadb/test/suite/rpl/r/rpl_slow_query_log.result
5140share/mariadb/test/suite/rpl/r/rpl_sp.result 5154share/mariadb/test/suite/rpl/r/rpl_sp.result
5141share/mariadb/test/suite/rpl/r/rpl_sp004.result 5155share/mariadb/test/suite/rpl/r/rpl_sp004.result
5142share/mariadb/test/suite/rpl/r/rpl_sp_effects.result 5156share/mariadb/test/suite/rpl/r/rpl_sp_effects.result
5143share/mariadb/test/suite/rpl/r/rpl_spec_variables.result 5157share/mariadb/test/suite/rpl/r/rpl_spec_variables.result
 5158share/mariadb/test/suite/rpl/r/rpl_special_charset.result
5144share/mariadb/test/suite/rpl/r/rpl_sporadic_master.result 5159share/mariadb/test/suite/rpl/r/rpl_sporadic_master.result
5145share/mariadb/test/suite/rpl/r/rpl_ssl.result 5160share/mariadb/test/suite/rpl/r/rpl_ssl.result
5146share/mariadb/test/suite/rpl/r/rpl_ssl1.result 5161share/mariadb/test/suite/rpl/r/rpl_ssl1.result
5147share/mariadb/test/suite/rpl/r/rpl_start_slave_deadlock_sys_vars.result 5162share/mariadb/test/suite/rpl/r/rpl_start_slave_deadlock_sys_vars.result
5148share/mariadb/test/suite/rpl/r/rpl_start_stop_slave.result 5163share/mariadb/test/suite/rpl/r/rpl_start_stop_slave.result
5149share/mariadb/test/suite/rpl/r/rpl_stm_000001.result 5164share/mariadb/test/suite/rpl/r/rpl_stm_000001.result
5150share/mariadb/test/suite/rpl/r/rpl_stm_EE_err2.result 5165share/mariadb/test/suite/rpl/r/rpl_stm_EE_err2.result
5151share/mariadb/test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result 5166share/mariadb/test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
5152share/mariadb/test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result 5167share/mariadb/test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
5153share/mariadb/test/suite/rpl/r/rpl_stm_conflicts.result 5168share/mariadb/test/suite/rpl/r/rpl_stm_conflicts.result
5154share/mariadb/test/suite/rpl/r/rpl_stm_drop_create_temp_table.result 5169share/mariadb/test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
5155share/mariadb/test/suite/rpl/r/rpl_stm_flsh_tbls.result 5170share/mariadb/test/suite/rpl/r/rpl_stm_flsh_tbls.result
5156share/mariadb/test/suite/rpl/r/rpl_stm_found_rows.result 5171share/mariadb/test/suite/rpl/r/rpl_stm_found_rows.result
@@ -5187,26 +5202,27 @@ share/mariadb/test/suite/rpl/r/rpl_trigg @@ -5187,26 +5202,27 @@ share/mariadb/test/suite/rpl/r/rpl_trigg
5187share/mariadb/test/suite/rpl/r/rpl_trunc_temp.result 5202share/mariadb/test/suite/rpl/r/rpl_trunc_temp.result
5188share/mariadb/test/suite/rpl/r/rpl_truncate_2myisam.result 5203share/mariadb/test/suite/rpl/r/rpl_truncate_2myisam.result
5189share/mariadb/test/suite/rpl/r/rpl_truncate_3innodb.result 5204share/mariadb/test/suite/rpl/r/rpl_truncate_3innodb.result
5190share/mariadb/test/suite/rpl/r/rpl_typeconv.result 5205share/mariadb/test/suite/rpl/r/rpl_typeconv.result
5191share/mariadb/test/suite/rpl/r/rpl_typeconv_innodb.result 5206share/mariadb/test/suite/rpl/r/rpl_typeconv_innodb.result
5192share/mariadb/test/suite/rpl/r/rpl_udf.result 5207share/mariadb/test/suite/rpl/r/rpl_udf.result
5193share/mariadb/test/suite/rpl/r/rpl_user.result 5208share/mariadb/test/suite/rpl/r/rpl_user.result
5194share/mariadb/test/suite/rpl/r/rpl_user_variables.result 5209share/mariadb/test/suite/rpl/r/rpl_user_variables.result
5195share/mariadb/test/suite/rpl/r/rpl_variables.result 5210share/mariadb/test/suite/rpl/r/rpl_variables.result
5196share/mariadb/test/suite/rpl/r/rpl_variables_stm.result 5211share/mariadb/test/suite/rpl/r/rpl_variables_stm.result
5197share/mariadb/test/suite/rpl/r/rpl_view.result 5212share/mariadb/test/suite/rpl/r/rpl_view.result
5198share/mariadb/test/suite/rpl/r/rpl_view_multi.result 5213share/mariadb/test/suite/rpl/r/rpl_view_multi.result
5199share/mariadb/test/suite/rpl/r/semisync_memleak_4066.result 5214share/mariadb/test/suite/rpl/r/semisync_memleak_4066.result
 5215share/mariadb/test/suite/rpl/r/show_status_stop_slave_race-7126.result
5200share/mariadb/test/suite/rpl/rpl_1slave_base.cnf 5216share/mariadb/test/suite/rpl/rpl_1slave_base.cnf
5201share/mariadb/test/suite/rpl/t/failed_create_view-6409.test 5217share/mariadb/test/suite/rpl/t/failed_create_view-6409.test
5202share/mariadb/test/suite/rpl/t/kill_hard-6290.test 5218share/mariadb/test/suite/rpl/t/kill_hard-6290.test
5203share/mariadb/test/suite/rpl/t/last_insert_id.cnf 5219share/mariadb/test/suite/rpl/t/last_insert_id.cnf
5204share/mariadb/test/suite/rpl/t/last_insert_id.test 5220share/mariadb/test/suite/rpl/t/last_insert_id.test
5205share/mariadb/test/suite/rpl/t/myisam_external_lock-slave.opt 5221share/mariadb/test/suite/rpl/t/myisam_external_lock-slave.opt
5206share/mariadb/test/suite/rpl/t/myisam_external_lock.test 5222share/mariadb/test/suite/rpl/t/myisam_external_lock.test
5207share/mariadb/test/suite/rpl/t/replace.test 5223share/mariadb/test/suite/rpl/t/replace.test
5208share/mariadb/test/suite/rpl/t/rpl_000010-slave.opt 5224share/mariadb/test/suite/rpl/t/rpl_000010-slave.opt
5209share/mariadb/test/suite/rpl/t/rpl_000010.test 5225share/mariadb/test/suite/rpl/t/rpl_000010.test
5210share/mariadb/test/suite/rpl/t/rpl_000011-slave.opt 5226share/mariadb/test/suite/rpl/t/rpl_000011-slave.opt
5211share/mariadb/test/suite/rpl/t/rpl_000011.test 5227share/mariadb/test/suite/rpl/t/rpl_000011.test
5212share/mariadb/test/suite/rpl/t/rpl_000013.test 5228share/mariadb/test/suite/rpl/t/rpl_000013.test
@@ -5551,26 +5567,28 @@ share/mariadb/test/suite/rpl/t/rpl_slave @@ -5551,26 +5567,28 @@ share/mariadb/test/suite/rpl/t/rpl_slave
5551share/mariadb/test/suite/rpl/t/rpl_slave_skip.test 5567share/mariadb/test/suite/rpl/t/rpl_slave_skip.test
5552share/mariadb/test/suite/rpl/t/rpl_slave_status.test 5568share/mariadb/test/suite/rpl/t/rpl_slave_status.test
5553share/mariadb/test/suite/rpl/t/rpl_slow_query_log-slave.opt 5569share/mariadb/test/suite/rpl/t/rpl_slow_query_log-slave.opt
5554share/mariadb/test/suite/rpl/t/rpl_slow_query_log.test 5570share/mariadb/test/suite/rpl/t/rpl_slow_query_log.test
5555share/mariadb/test/suite/rpl/t/rpl_sp-master.opt 5571share/mariadb/test/suite/rpl/t/rpl_sp-master.opt
5556share/mariadb/test/suite/rpl/t/rpl_sp-slave.opt 5572share/mariadb/test/suite/rpl/t/rpl_sp-slave.opt
5557share/mariadb/test/suite/rpl/t/rpl_sp.test 5573share/mariadb/test/suite/rpl/t/rpl_sp.test
5558share/mariadb/test/suite/rpl/t/rpl_sp004.test 5574share/mariadb/test/suite/rpl/t/rpl_sp004.test
5559share/mariadb/test/suite/rpl/t/rpl_sp_effects-master.opt 5575share/mariadb/test/suite/rpl/t/rpl_sp_effects-master.opt
5560share/mariadb/test/suite/rpl/t/rpl_sp_effects-slave.opt 5576share/mariadb/test/suite/rpl/t/rpl_sp_effects-slave.opt
5561share/mariadb/test/suite/rpl/t/rpl_sp_effects.test 5577share/mariadb/test/suite/rpl/t/rpl_sp_effects.test
5562share/mariadb/test/suite/rpl/t/rpl_spec_variables-slave.opt 5578share/mariadb/test/suite/rpl/t/rpl_spec_variables-slave.opt
5563share/mariadb/test/suite/rpl/t/rpl_spec_variables.test 5579share/mariadb/test/suite/rpl/t/rpl_spec_variables.test
 5580share/mariadb/test/suite/rpl/t/rpl_special_charset.opt
 5581share/mariadb/test/suite/rpl/t/rpl_special_charset.test
5564share/mariadb/test/suite/rpl/t/rpl_sporadic_master-master.opt 5582share/mariadb/test/suite/rpl/t/rpl_sporadic_master-master.opt
5565share/mariadb/test/suite/rpl/t/rpl_sporadic_master.test 5583share/mariadb/test/suite/rpl/t/rpl_sporadic_master.test
5566share/mariadb/test/suite/rpl/t/rpl_ssl.test 5584share/mariadb/test/suite/rpl/t/rpl_ssl.test
5567share/mariadb/test/suite/rpl/t/rpl_ssl1.test 5585share/mariadb/test/suite/rpl/t/rpl_ssl1.test
5568share/mariadb/test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test 5586share/mariadb/test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test
5569share/mariadb/test/suite/rpl/t/rpl_start_stop_slave-slave.opt 5587share/mariadb/test/suite/rpl/t/rpl_start_stop_slave-slave.opt
5570share/mariadb/test/suite/rpl/t/rpl_start_stop_slave.test 5588share/mariadb/test/suite/rpl/t/rpl_start_stop_slave.test
5571share/mariadb/test/suite/rpl/t/rpl_stm_000001.test 5589share/mariadb/test/suite/rpl/t/rpl_stm_000001.test
5572share/mariadb/test/suite/rpl/t/rpl_stm_EE_err2.test 5590share/mariadb/test/suite/rpl/t/rpl_stm_EE_err2.test
5573share/mariadb/test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test 5591share/mariadb/test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test
5574share/mariadb/test/suite/rpl/t/rpl_stm_binlog_direct-master.opt 5592share/mariadb/test/suite/rpl/t/rpl_stm_binlog_direct-master.opt
5575share/mariadb/test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test 5593share/mariadb/test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
5576share/mariadb/test/suite/rpl/t/rpl_stm_conflicts.test 5594share/mariadb/test/suite/rpl/t/rpl_stm_conflicts.test
@@ -5619,26 +5637,27 @@ share/mariadb/test/suite/rpl/t/rpl_trunc @@ -5619,26 +5637,27 @@ share/mariadb/test/suite/rpl/t/rpl_trunc
5619share/mariadb/test/suite/rpl/t/rpl_truncate_2myisam.test 5637share/mariadb/test/suite/rpl/t/rpl_truncate_2myisam.test
5620share/mariadb/test/suite/rpl/t/rpl_truncate_3innodb.test 5638share/mariadb/test/suite/rpl/t/rpl_truncate_3innodb.test
5621share/mariadb/test/suite/rpl/t/rpl_typeconv-slave.opt 5639share/mariadb/test/suite/rpl/t/rpl_typeconv-slave.opt
5622share/mariadb/test/suite/rpl/t/rpl_typeconv.test 5640share/mariadb/test/suite/rpl/t/rpl_typeconv.test
5623share/mariadb/test/suite/rpl/t/rpl_typeconv_innodb.test 5641share/mariadb/test/suite/rpl/t/rpl_typeconv_innodb.test
5624share/mariadb/test/suite/rpl/t/rpl_udf.test 5642share/mariadb/test/suite/rpl/t/rpl_udf.test
5625share/mariadb/test/suite/rpl/t/rpl_user.test 5643share/mariadb/test/suite/rpl/t/rpl_user.test
5626share/mariadb/test/suite/rpl/t/rpl_user_variables.test 5644share/mariadb/test/suite/rpl/t/rpl_user_variables.test
5627share/mariadb/test/suite/rpl/t/rpl_variables.test 5645share/mariadb/test/suite/rpl/t/rpl_variables.test
5628share/mariadb/test/suite/rpl/t/rpl_variables_stm.test 5646share/mariadb/test/suite/rpl/t/rpl_variables_stm.test
5629share/mariadb/test/suite/rpl/t/rpl_view.test 5647share/mariadb/test/suite/rpl/t/rpl_view.test
5630share/mariadb/test/suite/rpl/t/rpl_view_multi.test 5648share/mariadb/test/suite/rpl/t/rpl_view_multi.test
5631share/mariadb/test/suite/rpl/t/semisync_memleak_4066.test 5649share/mariadb/test/suite/rpl/t/semisync_memleak_4066.test
 5650share/mariadb/test/suite/rpl/t/show_status_stop_slave_race-7126.test
5632share/mariadb/test/suite/sphinx/my.cnf 5651share/mariadb/test/suite/sphinx/my.cnf
5633share/mariadb/test/suite/sphinx/sphinx.result 5652share/mariadb/test/suite/sphinx/sphinx.result
5634share/mariadb/test/suite/sphinx/sphinx.test 5653share/mariadb/test/suite/sphinx/sphinx.test
5635share/mariadb/test/suite/sphinx/suite.opt 5654share/mariadb/test/suite/sphinx/suite.opt
5636share/mariadb/test/suite/sphinx/suite.pm 5655share/mariadb/test/suite/sphinx/suite.pm
5637share/mariadb/test/suite/sphinx/testdata.xml 5656share/mariadb/test/suite/sphinx/testdata.xml
5638share/mariadb/test/suite/sphinx/union-5539.result 5657share/mariadb/test/suite/sphinx/union-5539.result
5639share/mariadb/test/suite/sphinx/union-5539.test 5658share/mariadb/test/suite/sphinx/union-5539.test
5640share/mariadb/test/suite/storage_engine/1st.result 5659share/mariadb/test/suite/storage_engine/1st.result
5641share/mariadb/test/suite/storage_engine/1st.test 5660share/mariadb/test/suite/storage_engine/1st.test
5642share/mariadb/test/suite/storage_engine/alter_table.inc 5661share/mariadb/test/suite/storage_engine/alter_table.inc
5643share/mariadb/test/suite/storage_engine/alter_table.result 5662share/mariadb/test/suite/storage_engine/alter_table.result
5644share/mariadb/test/suite/storage_engine/alter_table.test 5663share/mariadb/test/suite/storage_engine/alter_table.test
@@ -7293,26 +7312,27 @@ share/mariadb/test/t/ctype_latin1.test @@ -7293,26 +7312,27 @@ share/mariadb/test/t/ctype_latin1.test
7293share/mariadb/test/t/ctype_latin1_de-master.opt 7312share/mariadb/test/t/ctype_latin1_de-master.opt
7294share/mariadb/test/t/ctype_latin1_de.test 7313share/mariadb/test/t/ctype_latin1_de.test
7295share/mariadb/test/t/ctype_latin2.test 7314share/mariadb/test/t/ctype_latin2.test
7296share/mariadb/test/t/ctype_latin2_ch.test 7315share/mariadb/test/t/ctype_latin2_ch.test
7297share/mariadb/test/t/ctype_ldml-master.opt 7316share/mariadb/test/t/ctype_ldml-master.opt
7298share/mariadb/test/t/ctype_ldml.test 7317share/mariadb/test/t/ctype_ldml.test
7299share/mariadb/test/t/ctype_like_range.test 7318share/mariadb/test/t/ctype_like_range.test
7300share/mariadb/test/t/ctype_many.test 7319share/mariadb/test/t/ctype_many.test
7301share/mariadb/test/t/ctype_mb.test 7320share/mariadb/test/t/ctype_mb.test
7302share/mariadb/test/t/ctype_recoding.test 7321share/mariadb/test/t/ctype_recoding.test
7303share/mariadb/test/t/ctype_sjis.test 7322share/mariadb/test/t/ctype_sjis.test
7304share/mariadb/test/t/ctype_tis620.test 7323share/mariadb/test/t/ctype_tis620.test
7305share/mariadb/test/t/ctype_uca.test 7324share/mariadb/test/t/ctype_uca.test
 7325share/mariadb/test/t/ctype_uca_innodb.test
7306share/mariadb/test/t/ctype_ucs.test 7326share/mariadb/test/t/ctype_ucs.test
7307share/mariadb/test/t/ctype_ucs2_def-master.opt 7327share/mariadb/test/t/ctype_ucs2_def-master.opt
7308share/mariadb/test/t/ctype_ucs2_def.test 7328share/mariadb/test/t/ctype_ucs2_def.test
7309share/mariadb/test/t/ctype_ucs2_query_cache-master.opt 7329share/mariadb/test/t/ctype_ucs2_query_cache-master.opt
7310share/mariadb/test/t/ctype_ucs2_query_cache.test 7330share/mariadb/test/t/ctype_ucs2_query_cache.test
7311share/mariadb/test/t/ctype_ujis.test 7331share/mariadb/test/t/ctype_ujis.test
7312share/mariadb/test/t/ctype_ujis_ucs2.test 7332share/mariadb/test/t/ctype_ujis_ucs2.test
7313share/mariadb/test/t/ctype_utf16.test 7333share/mariadb/test/t/ctype_utf16.test
7314share/mariadb/test/t/ctype_utf16_def-master.opt 7334share/mariadb/test/t/ctype_utf16_def-master.opt
7315share/mariadb/test/t/ctype_utf16_def.test 7335share/mariadb/test/t/ctype_utf16_def.test
7316share/mariadb/test/t/ctype_utf16_uca.test 7336share/mariadb/test/t/ctype_utf16_uca.test
7317share/mariadb/test/t/ctype_utf32.test 7337share/mariadb/test/t/ctype_utf32.test
7318share/mariadb/test/t/ctype_utf32_uca.test 7338share/mariadb/test/t/ctype_utf32_uca.test
@@ -7364,26 +7384,27 @@ share/mariadb/test/t/events_microsec.tes @@ -7364,26 +7384,27 @@ share/mariadb/test/t/events_microsec.tes
7364share/mariadb/test/t/events_restart-master.opt 7384share/mariadb/test/t/events_restart-master.opt
7365share/mariadb/test/t/events_restart.test 7385share/mariadb/test/t/events_restart.test
7366share/mariadb/test/t/events_scheduling.test 7386share/mariadb/test/t/events_scheduling.test
7367share/mariadb/test/t/events_stress.test 7387share/mariadb/test/t/events_stress.test
7368share/mariadb/test/t/events_time_zone.test 7388share/mariadb/test/t/events_time_zone.test
7369share/mariadb/test/t/events_trans.test 7389share/mariadb/test/t/events_trans.test
7370share/mariadb/test/t/events_trans_notembedded.test 7390share/mariadb/test/t/events_trans_notembedded.test
7371share/mariadb/test/t/execution_constants.test 7391share/mariadb/test/t/execution_constants.test
7372share/mariadb/test/t/explain.test 7392share/mariadb/test/t/explain.test
7373share/mariadb/test/t/failed_auth_3909.test 7393share/mariadb/test/t/failed_auth_3909.test
7374share/mariadb/test/t/failed_auth_unixsocket.test 7394share/mariadb/test/t/failed_auth_unixsocket.test
7375share/mariadb/test/t/features.test 7395share/mariadb/test/t/features.test
7376share/mariadb/test/t/file_contents.test 7396share/mariadb/test/t/file_contents.test
 7397share/mariadb/test/t/filesort_bad_i_s-7585.test
7377share/mariadb/test/t/filesort_debug.test 7398share/mariadb/test/t/filesort_debug.test
7378share/mariadb/test/t/fix_priv_tables.test 7399share/mariadb/test/t/fix_priv_tables.test
7379share/mariadb/test/t/flush-innodb.test 7400share/mariadb/test/t/flush-innodb.test
7380share/mariadb/test/t/flush.test 7401share/mariadb/test/t/flush.test
7381share/mariadb/test/t/flush2-master.opt 7402share/mariadb/test/t/flush2-master.opt
7382share/mariadb/test/t/flush2.test 7403share/mariadb/test/t/flush2.test
7383share/mariadb/test/t/flush_block_commit.test 7404share/mariadb/test/t/flush_block_commit.test
7384share/mariadb/test/t/flush_block_commit_notembedded.test 7405share/mariadb/test/t/flush_block_commit_notembedded.test
7385share/mariadb/test/t/flush_read_lock.test 7406share/mariadb/test/t/flush_read_lock.test
7386share/mariadb/test/t/flush_read_lock_kill.test 7407share/mariadb/test/t/flush_read_lock_kill.test
7387share/mariadb/test/t/flush_table.test 7408share/mariadb/test/t/flush_table.test
7388share/mariadb/test/t/foreign_key.test 7409share/mariadb/test/t/foreign_key.test
7389share/mariadb/test/t/frm_bad_row_type-7333.test 7410share/mariadb/test/t/frm_bad_row_type-7333.test
@@ -7634,26 +7655,27 @@ share/mariadb/test/t/mysql_comments.test @@ -7634,26 +7655,27 @@ share/mariadb/test/t/mysql_comments.test
7634share/mariadb/test/t/mysql_cp932.test 7655share/mariadb/test/t/mysql_cp932.test
7635share/mariadb/test/t/mysql_delimiter.sql 7656share/mariadb/test/t/mysql_delimiter.sql
7636share/mariadb/test/t/mysql_delimiter_19799.sql 7657share/mariadb/test/t/mysql_delimiter_19799.sql
7637share/mariadb/test/t/mysql_delimiter_source.sql 7658share/mariadb/test/t/mysql_delimiter_source.sql
7638share/mariadb/test/t/mysql_embedded.test 7659share/mariadb/test/t/mysql_embedded.test
7639share/mariadb/test/t/mysql_locale_posix.test 7660share/mariadb/test/t/mysql_locale_posix.test
7640share/mariadb/test/t/mysql_not_windows.test 7661share/mariadb/test/t/mysql_not_windows.test
7641share/mariadb/test/t/mysql_plugin-master.opt 7662share/mariadb/test/t/mysql_plugin-master.opt
7642share/mariadb/test/t/mysql_plugin.test 7663share/mariadb/test/t/mysql_plugin.test
7643share/mariadb/test/t/mysql_protocols.test 7664share/mariadb/test/t/mysql_protocols.test
7644share/mariadb/test/t/mysql_tzinfo_to_sql_symlink.test 7665share/mariadb/test/t/mysql_tzinfo_to_sql_symlink.test
7645share/mariadb/test/t/mysql_upgrade.test 7666share/mariadb/test/t/mysql_upgrade.test
7646share/mariadb/test/t/mysql_upgrade_ssl.test 7667share/mariadb/test/t/mysql_upgrade_ssl.test
 7668share/mariadb/test/t/mysql_upgrade_view.test
7647share/mariadb/test/t/mysqladmin.test 7669share/mariadb/test/t/mysqladmin.test
7648share/mariadb/test/t/mysqlbinlog-innodb.test 7670share/mariadb/test/t/mysqlbinlog-innodb.test
7649share/mariadb/test/t/mysqlbinlog-master.opt 7671share/mariadb/test/t/mysqlbinlog-master.opt
7650share/mariadb/test/t/mysqlbinlog.test 7672share/mariadb/test/t/mysqlbinlog.test
7651share/mariadb/test/t/mysqlbinlog_row_big.test 7673share/mariadb/test/t/mysqlbinlog_row_big.test
7652share/mariadb/test/t/mysqlcheck.test 7674share/mariadb/test/t/mysqlcheck.test
7653share/mariadb/test/t/mysqld--defaults-file.test 7675share/mariadb/test/t/mysqld--defaults-file.test
7654share/mariadb/test/t/mysqld--help.test 7676share/mariadb/test/t/mysqld--help.test
7655share/mariadb/test/t/mysqld_option_err.test 7677share/mariadb/test/t/mysqld_option_err.test
7656share/mariadb/test/t/mysqldump-compat.opt 7678share/mariadb/test/t/mysqldump-compat.opt
7657share/mariadb/test/t/mysqldump-compat.test 7679share/mariadb/test/t/mysqldump-compat.test
7658share/mariadb/test/t/mysqldump-max-master.opt 7680share/mariadb/test/t/mysqldump-max-master.opt
7659share/mariadb/test/t/mysqldump-max.test 7681share/mariadb/test/t/mysqldump-max.test
@@ -7922,26 +7944,27 @@ share/mariadb/test/t/subselect_sj_nonmer @@ -7922,26 +7944,27 @@ share/mariadb/test/t/subselect_sj_nonmer
7922share/mariadb/test/t/sum_distinct-big.test 7944share/mariadb/test/t/sum_distinct-big.test
7923share/mariadb/test/t/sum_distinct.test 7945share/mariadb/test/t/sum_distinct.test
7924share/mariadb/test/t/symlink.test 7946share/mariadb/test/t/symlink.test
7925share/mariadb/test/t/synchronization.test 7947share/mariadb/test/t/synchronization.test
7926share/mariadb/test/t/sysdate_is_now-master.opt 7948share/mariadb/test/t/sysdate_is_now-master.opt
7927share/mariadb/test/t/sysdate_is_now.test 7949share/mariadb/test/t/sysdate_is_now.test
7928share/mariadb/test/t/system_mysql_db.test 7950share/mariadb/test/t/system_mysql_db.test
7929share/mariadb/test/t/system_mysql_db_fix40123.test 7951share/mariadb/test/t/system_mysql_db_fix40123.test
7930share/mariadb/test/t/system_mysql_db_fix50030.test 7952share/mariadb/test/t/system_mysql_db_fix50030.test
7931share/mariadb/test/t/system_mysql_db_fix50117.test 7953share/mariadb/test/t/system_mysql_db_fix50117.test
7932share/mariadb/test/t/system_mysql_db_refs.test 7954share/mariadb/test/t/system_mysql_db_refs.test
7933share/mariadb/test/t/table_elim.test 7955share/mariadb/test/t/table_elim.test
7934share/mariadb/test/t/table_elim_debug.test 7956share/mariadb/test/t/table_elim_debug.test
 7957share/mariadb/test/t/table_keyinfo-6838.test
7935share/mariadb/test/t/table_options.test 7958share/mariadb/test/t/table_options.test
7936share/mariadb/test/t/tablelock.test 7959share/mariadb/test/t/tablelock.test
7937share/mariadb/test/t/tablespace.test 7960share/mariadb/test/t/tablespace.test
7938share/mariadb/test/t/temp_table-master.opt 7961share/mariadb/test/t/temp_table-master.opt
7939share/mariadb/test/t/temp_table.test 7962share/mariadb/test/t/temp_table.test
7940share/mariadb/test/t/temporal_scale_4283.test 7963share/mariadb/test/t/temporal_scale_4283.test
7941share/mariadb/test/t/timezone-master.opt 7964share/mariadb/test/t/timezone-master.opt
7942share/mariadb/test/t/timezone.test 7965share/mariadb/test/t/timezone.test
7943share/mariadb/test/t/timezone2.test 7966share/mariadb/test/t/timezone2.test
7944share/mariadb/test/t/timezone3-master.opt 7967share/mariadb/test/t/timezone3-master.opt
7945share/mariadb/test/t/timezone3.test 7968share/mariadb/test/t/timezone3.test
7946share/mariadb/test/t/timezone4-master.opt 7969share/mariadb/test/t/timezone4-master.opt
7947share/mariadb/test/t/timezone4.test 7970share/mariadb/test/t/timezone4.test
@@ -7972,26 +7995,27 @@ share/mariadb/test/t/type_time_hires.tes @@ -7972,26 +7995,27 @@ share/mariadb/test/t/type_time_hires.tes
7972share/mariadb/test/t/type_timestamp.test 7995share/mariadb/test/t/type_timestamp.test
7973share/mariadb/test/t/type_timestamp_hires.test 7996share/mariadb/test/t/type_timestamp_hires.test
7974share/mariadb/test/t/type_uint.test 7997share/mariadb/test/t/type_uint.test
7975share/mariadb/test/t/type_varchar.test 7998share/mariadb/test/t/type_varchar.test
7976share/mariadb/test/t/type_year.test 7999share/mariadb/test/t/type_year.test
7977share/mariadb/test/t/udf.test 8000share/mariadb/test/t/udf.test
7978share/mariadb/test/t/udf_debug_sync.test 8001share/mariadb/test/t/udf_debug_sync.test
7979share/mariadb/test/t/udf_query_cache.test 8002share/mariadb/test/t/udf_query_cache.test
7980share/mariadb/test/t/udf_skip_grants-master.opt 8003share/mariadb/test/t/udf_skip_grants-master.opt
7981share/mariadb/test/t/udf_skip_grants.test 8004share/mariadb/test/t/udf_skip_grants.test
7982share/mariadb/test/t/union-master.opt 8005share/mariadb/test/t/union-master.opt
7983share/mariadb/test/t/union.test 8006share/mariadb/test/t/union.test
7984share/mariadb/test/t/union_crash-714.test 8007share/mariadb/test/t/union_crash-714.test
 8008share/mariadb/test/t/uniques_crash-7912.test
7985share/mariadb/test/t/unsafe_binlog_innodb-master.opt 8009share/mariadb/test/t/unsafe_binlog_innodb-master.opt
7986share/mariadb/test/t/unsafe_binlog_innodb.test 8010share/mariadb/test/t/unsafe_binlog_innodb.test
7987share/mariadb/test/t/update.test 8011share/mariadb/test/t/update.test
7988share/mariadb/test/t/update_ignore_216.test 8012share/mariadb/test/t/update_ignore_216.test
7989share/mariadb/test/t/upgrade.test 8013share/mariadb/test/t/upgrade.test
7990share/mariadb/test/t/user_limits-master.opt 8014share/mariadb/test/t/user_limits-master.opt
7991share/mariadb/test/t/user_limits.test 8015share/mariadb/test/t/user_limits.test
7992share/mariadb/test/t/user_var-binlog.test 8016share/mariadb/test/t/user_var-binlog.test
7993share/mariadb/test/t/user_var.test 8017share/mariadb/test/t/user_var.test
7994share/mariadb/test/t/userstat-badlogin-4824.test 8018share/mariadb/test/t/userstat-badlogin-4824.test
7995share/mariadb/test/t/varbinary.test 8019share/mariadb/test/t/varbinary.test
7996share/mariadb/test/t/variables-master.opt 8020share/mariadb/test/t/variables-master.opt
7997share/mariadb/test/t/variables-notembedded-master.opt 8021share/mariadb/test/t/variables-notembedded-master.opt
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-server/Attic/PLIST.SunOS (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-server/Attic/PLIST.SunOS 2015/04/16 20:21:19 1.1
+++ pkgsrc/databases/mariadb55-server/Attic/PLIST.SunOS 2015/05/07 12:45:29 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST.SunOS,v 1.1 2015/04/16 20:21:19 ryoon Exp $ 1@comment $NetBSD: PLIST.SunOS,v 1.2 2015/05/07 12:45:29 fhajny Exp $
2share/mysql/solaris/postinstall-solaris 2share/mariadb/solaris/postinstall-solaris