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 context 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,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.2 2015/05/07 12:45:28 fhajny Exp $
 #
 # used by databases/mariadb55-client/Makefile
 # used by databases/mariadb55-server/Makefile
 
-DISTNAME=	mariadb-5.5.42
+DISTNAME=	mariadb-5.5.43
 CATEGORIES=	databases
-MASTER_SITES=	https://downloads.mariadb.org/f/mariadb-5.5.42/source/
+MASTER_SITES=	https://downloads.mariadb.org/f/${DISTNAME}/source/
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mariadb.org/
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/PLIST (expand / switch to context 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,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/05/07 12:45:28 fhajny Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_client_test
@@ -105,7 +105,7 @@
 include/mysql/private/mysys_err.h
 include/mysql/private/password.h
 include/mysql/private/probes_mysql.h
-include/mysql/private/probes_mysql_dtrace.h
+${PLIST.dtrace}include/mysql/private/probes_mysql_dtrace.h
 include/mysql/private/probes_mysql_nodtrace.h
 include/mysql/private/queues.h
 include/mysql/private/rijndael.h
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/buildlink3.mk (expand / switch to context 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,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $
 
 BUILDLINK_TREE+=	mariadb-client
 
 .if !defined(MARIADB_CLIENT_BUILDLINK3_MK)
 MARIADB_CLIENT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mariadb-client+=	mariadb-client>=5.5.42
+BUILDLINK_API_DEPENDS.mariadb-client+=	mariadb-client>=5.5.43
 BUILDLINK_PKGSRCDIR.mariadb-client?=	../../databases/mariadb55-client
 BUILDLINK_PKGSRCDIR.mariadb-client?=	../../databases/mariadb55-client
 BUILDLINK_INCDIRS.mariadb-client?=	include/mysql
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/distinfo (expand / switch to context 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,22 +1,25 @@
-$NetBSD: distinfo,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2015/05/07 12:45:28 fhajny Exp $
 
-SHA1 (mariadb-5.5.42.tar.gz) = df5164df0ff3f21fac4400932dc075864b0fac98
-RMD160 (mariadb-5.5.42.tar.gz) = d9633171d9184498dba14837d1cf307fd4342079
-Size (mariadb-5.5.42.tar.gz) = 45586372 bytes
+SHA1 (mariadb-5.5.43.tar.gz) = 80223c91ecda64ec30a5056af225eee39a3782fd
+RMD160 (mariadb-5.5.43.tar.gz) = 93296e8d9e14949d47d4d0195f566891ba83bc76
+Size (mariadb-5.5.43.tar.gz) = 45651398 bytes
 SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a
 RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a
 Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = 02b414235a2cdfc1d5c95946010e0cdbada76c5d
-SHA1 (patch-CMakeLists.txt) = cc69f38e761ee5956dde27745377acde1728d63b
+SHA1 (patch-CMakeLists.txt) = 9c56523626837ab83ecef26f1c0609e084976fa7
 SHA1 (patch-client_completion_hash.cc) = 810dab31e17a19804323059d38f5ec7f0d55c3ab
-SHA1 (patch-client_mysql.cc) = a5296801f6960f77da12eeb749cc32a86f6bc545
+SHA1 (patch-client_mysql.cc) = bb50cbd627ce71bcc792ad285016e0269dbc741c
 SHA1 (patch-client_mysqladmin.cc) = ab05c6944d50c9b22365426656f0b61a5906d632
 SHA1 (patch-client_mysqlbinlog.cc) = 00146dfd7d0a6e0bb1a8c30395bc707af3b4a6c7
 SHA1 (patch-client_mysqlshow.c) = 82ddfb98ab85b3e96e56b5ecc0df25cc315b8dbc
+SHA1 (patch-cmake_dtrace.cmake) = 460799dee4d7f9d6c1e3b2dbf0412f8576297991
 SHA1 (patch-cmake_libutils.cmake) = 0c3f25f8e73ab0a062b539a8d551342a6ddf57c4
 SHA1 (patch-cmake_plugin.cmake) = b7566d25c80c2492a96c5617b96f9b6212b0fe93
-SHA1 (patch-cmake_readline.cmake) = 5b975b817c5c62712e061b121056816425368e92
+SHA1 (patch-cmake_readline.cmake) = eeadad96a6c8f042c82134b5488956f8094ba4ac
+SHA1 (patch-config.h.cmake) = 75d4c09eb34353057c6a8e36523f55d1bfdace59
 SHA1 (patch-include_CMakeLists.txt) = 9ce9db088fda6ed76039b818c27b74d584bae151
+SHA1 (patch-include_my__context.h) = 2f74d458d10c24261fdd532d197b84c44719c552
 SHA1 (patch-include_my_compare.h) = 9d04f444d56d705f3a57add7ad5f8fc5c7ce8341
 SHA1 (patch-include_my_net.h) = b6361a0871afdf66feabc82c5ad3559ff5b34c37
 SHA1 (patch-include_my_pthread.h) = 6d4ec91f90e717b0a075133fea535ee62d64d3ef
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/Attic/options.mk (expand / switch to context 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,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mariadb55
 
@@ -17,8 +17,10 @@
 .endif
 
 # Enable DTrace support
+PLIST_VARS+=		dtrace
 .if !empty(PKG_OPTIONS:Mdtrace)
 CMAKE_ARGS+=		-DENABLE_DTRACE=ON
+PLIST.dtrace=		yes
 .endif
 
 # Enable Sphinx SE support
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/patches/Attic/patch-CMakeLists.txt (expand / switch to context 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,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2015/05/07 12:45:29 fhajny Exp $
 
 Split configuration between mysql-client and mysql-server.
 Build with newer DTrace.
@@ -9,7 +9,7 @@
    SET(WITHOUT_DYNAMIC_PLUGINS 1)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
-+OPTION(ENABLED_DTRACE "Include support for DTrace probes" OFF)
++OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF)
  OPTION(CYBOZU "" OFF)
  OPTION(BACKUP_TEST "" OFF)
  OPTION(WITHOUT_SERVER OFF)
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-client/patches/Attic/patch-client_mysql.cc (expand / switch to context 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,4 +1,4 @@
-$NetBSD: patch-client_mysql.cc,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+$NetBSD: patch-client_mysql.cc,v 1.2 2015/05/07 12:45:29 fhajny Exp $
 
 --- client/mysql.cc.orig	2015-02-13 12:07:00.000000000 +0000
 +++ client/mysql.cc
@@ -11,3 +11,24 @@
  #define HAVE_READLINE
  #define USE_POPEN
  #endif
+@@ -2640,7 +2640,11 @@ static void initialize_readline (char *n
+   rl_completion_entry_function= &no_completion;
+   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
+ #else
++# if defined(USE_READLINE_V6)
++  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
++# else
+   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
++# endif
+   rl_completion_entry_function= &no_completion;
+ #endif
+ }
+@@ -2657,7 +2661,7 @@ static char **new_mysql_completion(const
+                                    int end __attribute__((unused)))
+ {
+   if (!status.batch && !quick)
+-#if defined(USE_NEW_READLINE_INTERFACE)
++#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_READLINE_V6)
+     return rl_completion_matches(text, new_command_generator);
+ #else
+     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 context 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,7 +1,7 @@
-$NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+$NetBSD: patch-cmake_readline.cmake,v 1.2 2015/05/07 12:45:29 fhajny Exp $
 
-* Fix cmake's check build error. Borrowed from mysql56's readline.cmake.
-
+Fix cmake's check build error. Borrowed from mysql56's readline.cmake.
+Fi build with pkgsrc readline>=6 that removed some deprecated symbols.
 --- cmake/readline.cmake.orig	2015-02-13 12:07:00.000000000 +0000
 +++ cmake/readline.cmake
 @@ -132,7 +132,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
@@ -22,7 +22,27 @@
      #if RL_VERSION_MAJOR > 5
      #error
      #endif
-@@ -180,8 +180,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
+@@ -152,6 +152,19 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
+     }"
+     READLINE_V5)
+ 
++    CHECK_C_SOURCE_COMPILES("
++    #include <stdio.h>
++    #include <readline/readline.h>
++    #if RL_VERSION_MAJOR < 6
++    #error
++    #endif
++    int main(int argc, char **argv)
++    {
++      return 0;
++    }"
++    READLINE_V6)
++    SET(USE_READLINE_V6 ${READLINE_V6})
++
+     IF(NEW_READLINE_INTERFACE)
+       IF (READLINE_V5)
+         SET(USE_NEW_READLINE_INTERFACE 1)
+@@ -180,8 +193,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
      #include <readline.h>
      int main(int argc, char **argv)
      {
@@ -35,7 +55,7 @@
      }"
      LIBEDIT_INTERFACE)
      SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE})
-@@ -195,32 +198,13 @@ MACRO (MYSQL_CHECK_READLINE)
+@@ -195,32 +211,13 @@ MACRO (MYSQL_CHECK_READLINE)
      SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline")
      FIND_CURSES()
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 context 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,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/16 20:21:19 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/05/07 12:45:29 fhajny Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -10,11 +10,11 @@
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_client_test_embedded
-bin/mysql_embedded
+${PLIST.embedded}bin/mysql_client_test_embedded
+${PLIST.embedded}bin/mysql_embedded
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
-bin/mysqltest_embedded
+${PLIST.embedded}bin/mysqltest_embedded
 bin/perror
 bin/replace
 bin/resolve_stack_dump
@@ -29,7 +29,7 @@
 include/mysql/private/derror.h
 include/mysql/private/des_key_file.h
 include/mysql/private/discover.h
-include/mysql/private/embedded_priv.h
+${PLIST.embedded}include/mysql/private/embedded_priv.h
 include/mysql/private/event_data_objects.h
 include/mysql/private/event_db_repository.h
 include/mysql/private/event_parse_data.h
@@ -187,9 +187,9 @@
 include/mysql/private/tztime.h
 include/mysql/private/unireg.h
 include/mysql/private/winservice.h
-lib/libmysqld.a
-lib/libmysqld.so
-lib/libmysqld.so.18
+${PLIST.embedded}lib/libmysqld.a
+${PLIST.embedded}lib/libmysqld.so
+${PLIST.embedded}lib/libmysqld.so.18
 lib/libmysqlservices.a
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth_0x0100.so
@@ -523,6 +523,7 @@
 share/mariadb/test/include/ctype_numconv.inc
 share/mariadb/test/include/ctype_regex.inc
 share/mariadb/test/include/ctype_str_to_date.inc
+share/mariadb/test/include/ctype_utf8_ilseq.inc
 share/mariadb/test/include/ctype_utf8_table.inc
 share/mariadb/test/include/ctype_utf8mb4.inc
 share/mariadb/test/include/daemon_example_bad_format.ini
@@ -1122,6 +1123,7 @@
 share/mariadb/test/r/ctype_sjis.result
 share/mariadb/test/r/ctype_tis620.result
 share/mariadb/test/r/ctype_uca.result
+share/mariadb/test/r/ctype_uca_innodb.result
 share/mariadb/test/r/ctype_ucs.result
 share/mariadb/test/r/ctype_ucs2_def.result
 share/mariadb/test/r/ctype_ucs2_query_cache.result
@@ -1183,6 +1185,7 @@
 share/mariadb/test/r/failed_auth_unixsocket.result
 share/mariadb/test/r/features.result
 share/mariadb/test/r/file_contents.result
+share/mariadb/test/r/filesort_bad_i_s-7585.result
 share/mariadb/test/r/filesort_debug.result
 share/mariadb/test/r/fix_priv_tables.result
 share/mariadb/test/r/flush-innodb.result
@@ -1433,6 +1436,7 @@
 share/mariadb/test/r/mysql_tzinfo_to_sql_symlink.result
 share/mariadb/test/r/mysql_upgrade.result
 share/mariadb/test/r/mysql_upgrade_ssl.result
+share/mariadb/test/r/mysql_upgrade_view.result
 share/mariadb/test/r/mysqladmin.result
 share/mariadb/test/r/mysqlbinlog-innodb.result
 share/mariadb/test/r/mysqlbinlog.result
@@ -1707,6 +1711,7 @@
 share/mariadb/test/r/system_mysql_db_refs.result
 share/mariadb/test/r/table_elim.result
 share/mariadb/test/r/table_elim_debug.result
+share/mariadb/test/r/table_keyinfo-6838.result
 share/mariadb/test/r/table_options.result
 share/mariadb/test/r/tablelock.result
 share/mariadb/test/r/tablespace.result
@@ -1753,6 +1758,7 @@
 share/mariadb/test/r/udf_skip_grants.result
 share/mariadb/test/r/union.result
 share/mariadb/test/r/union_crash-714.result
+share/mariadb/test/r/uniques_crash-7912.result
 share/mariadb/test/r/unsafe_binlog_innodb.result
 share/mariadb/test/r/update.result
 share/mariadb/test/r/update_ignore_216.result
@@ -1876,6 +1882,14 @@
 share/mariadb/test/std_data/mdev5029_2.MAD
 share/mariadb/test/std_data/mdev5029_2.MAI
 share/mariadb/test/std_data/mdev5029_2.frm
+share/mariadb/test/std_data/mysql_upgrade/event.MYD
+share/mariadb/test/std_data/mysql_upgrade/event.MYI
+share/mariadb/test/std_data/mysql_upgrade/event.frm
+share/mariadb/test/std_data/mysql_upgrade/v1.frm
+share/mariadb/test/std_data/mysql_upgrade/v1badcheck.frm
+share/mariadb/test/std_data/mysql_upgrade/v2.frm
+share/mariadb/test/std_data/mysql_upgrade/v3.frm
+share/mariadb/test/std_data/mysql_upgrade/v4.frm
 share/mariadb/test/std_data/ndb_backup50/BACKUP-1-0.1.Data
 share/mariadb/test/std_data/ndb_backup50/BACKUP-1-0.2.Data
 share/mariadb/test/std_data/ndb_backup50/BACKUP-1.1.ctl
@@ -2041,6 +2055,7 @@
 share/mariadb/test/suite/binlog/r/binlog_unsafe.result
 share/mariadb/test/suite/binlog/r/binlog_write_error.result
 share/mariadb/test/suite/binlog/r/load_data_stm_view.result
+share/mariadb/test/suite/binlog/r/temptable_uservar_disconnect-7938.result
 share/mariadb/test/suite/binlog/std_data/binlog_old_version_4_1.000001
 share/mariadb/test/suite/binlog/std_data/bug32407.001
 share/mariadb/test/suite/binlog/std_data/update-full-row.binlog
@@ -2150,6 +2165,7 @@
 share/mariadb/test/suite/binlog/t/binlog_unsafe.test
 share/mariadb/test/suite/binlog/t/binlog_write_error.test
 share/mariadb/test/suite/binlog/t/load_data_stm_view.test
+share/mariadb/test/suite/binlog/t/temptable_uservar_disconnect-7938.test
 share/mariadb/test/suite/csv/csv.result
 share/mariadb/test/suite/csv/csv.test
 share/mariadb/test/suite/csv/csv_alter_table.result
@@ -3507,7 +3523,6 @@
 share/mariadb/test/suite/innodb/r/innodb-index.result
 share/mariadb/test/suite/innodb/r/innodb-index_ucs2.result
 share/mariadb/test/suite/innodb/r/innodb-lock.result
-share/mariadb/test/suite/innodb/r/innodb-mdev-7055.result
 share/mariadb/test/suite/innodb/r/innodb-mdev-7513.result
 share/mariadb/test/suite/innodb/r/innodb-replace.result
 share/mariadb/test/suite/innodb/r/innodb-semi-consistent.result
@@ -3638,7 +3653,6 @@
 share/mariadb/test/suite/innodb/t/innodb-index_ucs2.test
 share/mariadb/test/suite/innodb/t/innodb-lock.test
 share/mariadb/test/suite/innodb/t/innodb-master.opt
-share/mariadb/test/suite/innodb/t/innodb-mdev-7055.test
 share/mariadb/test/suite/innodb/t/innodb-mdev-7513.test
 share/mariadb/test/suite/innodb/t/innodb-replace.test
 share/mariadb/test/suite/innodb/t/innodb-semi-consistent-master.opt
@@ -5141,6 +5155,7 @@
 share/mariadb/test/suite/rpl/r/rpl_sp004.result
 share/mariadb/test/suite/rpl/r/rpl_sp_effects.result
 share/mariadb/test/suite/rpl/r/rpl_spec_variables.result
+share/mariadb/test/suite/rpl/r/rpl_special_charset.result
 share/mariadb/test/suite/rpl/r/rpl_sporadic_master.result
 share/mariadb/test/suite/rpl/r/rpl_ssl.result
 share/mariadb/test/suite/rpl/r/rpl_ssl1.result
@@ -5197,6 +5212,7 @@
 share/mariadb/test/suite/rpl/r/rpl_view.result
 share/mariadb/test/suite/rpl/r/rpl_view_multi.result
 share/mariadb/test/suite/rpl/r/semisync_memleak_4066.result
+share/mariadb/test/suite/rpl/r/show_status_stop_slave_race-7126.result
 share/mariadb/test/suite/rpl/rpl_1slave_base.cnf
 share/mariadb/test/suite/rpl/t/failed_create_view-6409.test
 share/mariadb/test/suite/rpl/t/kill_hard-6290.test
@@ -5561,6 +5577,8 @@
 share/mariadb/test/suite/rpl/t/rpl_sp_effects.test
 share/mariadb/test/suite/rpl/t/rpl_spec_variables-slave.opt
 share/mariadb/test/suite/rpl/t/rpl_spec_variables.test
+share/mariadb/test/suite/rpl/t/rpl_special_charset.opt
+share/mariadb/test/suite/rpl/t/rpl_special_charset.test
 share/mariadb/test/suite/rpl/t/rpl_sporadic_master-master.opt
 share/mariadb/test/suite/rpl/t/rpl_sporadic_master.test
 share/mariadb/test/suite/rpl/t/rpl_ssl.test
@@ -5629,6 +5647,7 @@
 share/mariadb/test/suite/rpl/t/rpl_view.test
 share/mariadb/test/suite/rpl/t/rpl_view_multi.test
 share/mariadb/test/suite/rpl/t/semisync_memleak_4066.test
+share/mariadb/test/suite/rpl/t/show_status_stop_slave_race-7126.test
 share/mariadb/test/suite/sphinx/my.cnf
 share/mariadb/test/suite/sphinx/sphinx.result
 share/mariadb/test/suite/sphinx/sphinx.test
@@ -7303,6 +7322,7 @@
 share/mariadb/test/t/ctype_sjis.test
 share/mariadb/test/t/ctype_tis620.test
 share/mariadb/test/t/ctype_uca.test
+share/mariadb/test/t/ctype_uca_innodb.test
 share/mariadb/test/t/ctype_ucs.test
 share/mariadb/test/t/ctype_ucs2_def-master.opt
 share/mariadb/test/t/ctype_ucs2_def.test
@@ -7374,6 +7394,7 @@
 share/mariadb/test/t/failed_auth_unixsocket.test
 share/mariadb/test/t/features.test
 share/mariadb/test/t/file_contents.test
+share/mariadb/test/t/filesort_bad_i_s-7585.test
 share/mariadb/test/t/filesort_debug.test
 share/mariadb/test/t/fix_priv_tables.test
 share/mariadb/test/t/flush-innodb.test
@@ -7644,6 +7665,7 @@
 share/mariadb/test/t/mysql_tzinfo_to_sql_symlink.test
 share/mariadb/test/t/mysql_upgrade.test
 share/mariadb/test/t/mysql_upgrade_ssl.test
+share/mariadb/test/t/mysql_upgrade_view.test
 share/mariadb/test/t/mysqladmin.test
 share/mariadb/test/t/mysqlbinlog-innodb.test
 share/mariadb/test/t/mysqlbinlog-master.opt
@@ -7932,6 +7954,7 @@
 share/mariadb/test/t/system_mysql_db_refs.test
 share/mariadb/test/t/table_elim.test
 share/mariadb/test/t/table_elim_debug.test
+share/mariadb/test/t/table_keyinfo-6838.test
 share/mariadb/test/t/table_options.test
 share/mariadb/test/t/tablelock.test
 share/mariadb/test/t/tablespace.test
@@ -7982,6 +8005,7 @@
 share/mariadb/test/t/union-master.opt
 share/mariadb/test/t/union.test
 share/mariadb/test/t/union_crash-714.test
+share/mariadb/test/t/uniques_crash-7912.test
 share/mariadb/test/t/unsafe_binlog_innodb-master.opt
 share/mariadb/test/t/unsafe_binlog_innodb.test
 share/mariadb/test/t/update.test
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb55-server/Attic/PLIST.SunOS (expand / switch to context 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 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2015/04/16 20:21:19 ryoon Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2015/05/07 12:45:29 fhajny Exp $
-share/mysql/solaris/postinstall-solaris
+share/mariadb/solaris/postinstall-solaris