Date: Fri, 27 Sep 2013 02:23:49 +0300 (EEST)
From: Alexandr Kovalenko <never@nevermind.kiev.ua>
To: FreeBSD-gnats-submit@freebsd.org
Subject: ports/182426: Update databases/mariadb55-{client,server} to 5.5.33a
Message-ID: <201309262323.r8QNNnXV011916@naia.nevermind.kiev.ua>
Resent-Message-ID: <201309262330.r8QNU1bK073752@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182426
>Category: ports
>Synopsis: Update databases/mariadb55-{client,server} to 5.5.33a
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 26 23:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Alexandr Kovalenko
>Release: FreeBSD 9.2-PRERELEASE amd64
>Organization:
Nevermind LLC
>Environment:
System: FreeBSD 9.2-PRERELEASE
>Description:
- Update to 5.5.33a
- Remove PBXT storage engine support, as it was removed upstream
- Allow building mariadb with libc++ and clang [ports/182408]
- Fix build on 10-CURRENT [ports/181407]
- Use bundled jemalloc instead of system one if system one is older than bundled
- Add libexecinfo support
- Use "FreeBSD Ports" as build comment instead of default "Source distribution"
>How-To-Repeat:
N/A
>Fix:
Apply patch attached.
diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
index 4b21cf3..8ecaedb 100644
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -21,7 +21,8 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql
MAN1= msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
- mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
+ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 \
+ mysql_plugin.1
CLIENT_ONLY= yes
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt
index 82d2cd9..161956b 100644
--- a/databases/mariadb55-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2013-01-29 16:12:48.000000000 +0200
-+++ CMakeLists.txt 2013-02-01 20:09:31.000000000 +0200
-@@ -303,28 +303,8 @@
+--- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300
++++ CMakeLists.txt 2013-09-27 01:30:14.000000000 +0300
+@@ -306,28 +306,8 @@
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(libservices)
ADD_SUBDIRECTORY(scripts)
@@ -29,17 +29,25 @@
IF(UNIX)
ADD_SUBDIRECTORY(man)
ENDIF()
-@@ -362,6 +342,7 @@
+@@ -339,7 +319,6 @@
+ ADD_SUBDIRECTORY(win/upgrade_wizard)
+ ADD_SUBDIRECTORY(win/packaging)
+ ENDIF()
+-ADD_SUBDIRECTORY(packaging/solaris)
+
+ CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)
+ CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)
+@@ -366,6 +345,7 @@
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
- INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql
- DESTINATION ${INSTALL_DOCREADMEDIR}
- COMPONENT Readme
-@@ -372,6 +353,7 @@
+ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
+ COMPONENT Readme)
+ INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+@@ -373,6 +353,7 @@
IF(UNIX)
- INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+ INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
ENDIF()
+ENDIF()
diff --git a/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake
index dd8947d..5089f86 100644
--- a/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake
+++ b/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake
@@ -1,15 +1,16 @@
---- cmake/os/FreeBSD.cmake.orig 2013-01-13 02:13:17.000000000 +0200
-+++ cmake/os/FreeBSD.cmake 2013-01-13 02:14:15.000000000 +0200
-@@ -24,6 +24,7 @@
+--- cmake/os/FreeBSD.cmake.orig 2013-09-27 00:09:44.000000000 +0300
++++ cmake/os/FreeBSD.cmake 2013-09-27 00:09:57.000000000 +0300
+@@ -24,9 +24,10 @@
# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
# Find libexecinfo (library that contains backtrace_symbols etc)
-+IF(FALSE)
- INCLUDE_DIRECTORIES(/usr/local/include)
- SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
- SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
-@@ -31,6 +32,7 @@
+-INCLUDE_DIRECTORIES(/usr/local/include)
+-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
+-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
++SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
++INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
++SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
++SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
+ FIND_LIBRARY(EXECINFO NAMES execinfo)
IF(EXECINFO)
SET(LIBEXECINFO ${EXECINFO})
- ENDIF()
-+ENDIF()
diff --git a/databases/mariadb55-client/pkg-plist b/databases/mariadb55-client/pkg-plist
index a24d9ff..282f86d 100644
--- a/databases/mariadb55-client/pkg-plist
+++ b/databases/mariadb55-client/pkg-plist
@@ -52,6 +52,7 @@ include/mysql/psi/mysql_thread.h
include/mysql/psi/psi.h
include/mysql/service_debug_sync.h
include/mysql/service_kill_statement.h
+include/mysql/service_logger.h
include/mysql/service_my_snprintf.h
include/mysql/service_progress_report.h
include/mysql/service_thd_alloc.h
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 777f7ac..4badd84 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD: head/databases/mariadb55-server/Makefile 327717 2013-09-20 16:13:47Z bapt $
PORTNAME?= mariadb
-PORTVERSION= 5.5.31
+PORTVERSION= 5.5.33a
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
@@ -18,6 +18,8 @@ PKGNAMESUFFIX?= -server
MAINTAINER= never@nevermind.kiev.ua
COMMENT?= Multithreaded SQL database (server)
+LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
+
SLAVEDIRS= databases/mariadb55-client
USES= cmake
NO_OPTIONS_SORT=yes
@@ -44,8 +46,11 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_SHAREDIR="share" \
-DINSTALL_SQLBENCHDIR="share/mysql" \
-DINSTALL_SUPPORTFILESDIR="share/mysql" \
+ -DWITH_UNIT_TESTS=0 \
-DWITH_LIBEDIT=0 \
- -DWITH_LIBWRAP=1
+ -DWITH_LIBWRAP=1 \
+ -DEXECINFO_ROOT=${LOCALBASE} \
+ -DCOMPILATION_COMMENT="FreeBSD Ports"
.ifdef USE_MYSQL
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
@@ -56,18 +61,23 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql
# MySQL-Server options
.if !defined(CLIENT_ONLY)
-OPTIONS_DEFINE+= OQGRAPH PBXT MAXKEY
+OPTIONS_DEFINE+= OQGRAPH MAXKEY
OQGRAPH_DESC= Open Query Graph Computation engine
-PBXT_DESC= MVCC-based transactional engine
MAXKEY_DESC= Change max key length from 1000 to 4000
-OPTIONS_DEFAULT+= PBXT MAXKEY
+OPTIONS_DEFAULT+= MAXKEY
.endif
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} >= 1000012
+CMAKE_ARGS+= -DWITH_JEMALLOC="no"
+.else
+CMAKE_ARGS+= -DWITH_JEMALLOC="bundled"
+.endif
+
.if ${PORT_OPTIONS:MSSL}
.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL= yes
@@ -128,11 +138,6 @@ CMAKE_ARGS+= -DWITH_OQGRAPH_STORAGE_ENGINE=1
PLIST_SUB+= OQGRAPH=""
LIB_DEPENDS+= boost_system:${PORTSDIR}/devel/boost-libs
.endif
-.if empty(PORT_OPTIONS:MPBXT)
-CMAKE_ARGS+= -DWITHOUT_PBXT_STORAGE_ENGINE=1
-.else
-CMAKE_ARGS+= -DWITH_PBXT_STORAGE_ENGINE=1
-.endif
.if ${PORT_OPTIONS:MMAXKEY}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h
.endif
diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo
index dd12e77..4e86477 100644
--- a/databases/mariadb55-server/distinfo
+++ b/databases/mariadb55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-5.5.31.tar.gz) = 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28
-SIZE (mariadb-5.5.31.tar.gz) = 27888530
+SHA256 (mariadb-5.5.33a.tar.gz) = adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b
+SIZE (mariadb-5.5.33a.tar.gz) = 45226492
diff --git a/databases/mariadb55-server/files/patch-CMakeLists.txt b/databases/mariadb55-server/files/patch-CMakeLists.txt
index 4529fe0..c03e2ad 100644
--- a/databases/mariadb55-server/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2012-11-28 17:49:36.000000000 +0200
-+++ CMakeLists.txt 2012-12-23 02:25:55.000000000 +0200
-@@ -306,17 +306,12 @@
+--- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300
++++ CMakeLists.txt 2013-09-27 01:39:19.000000000 +0300
+@@ -310,17 +310,12 @@
ADD_SUBDIRECTORY(support-files)
IF(NOT WITHOUT_SERVER)
@@ -18,17 +18,25 @@
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
ADD_SUBDIRECTORY(internal)
-@@ -360,6 +355,7 @@
+@@ -339,7 +334,6 @@
+ ADD_SUBDIRECTORY(win/upgrade_wizard)
+ ADD_SUBDIRECTORY(win/packaging)
+ ENDIF()
+-ADD_SUBDIRECTORY(packaging/solaris)
+
+ CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)
+ CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)
+@@ -366,6 +360,7 @@
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
- INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql
- DESTINATION ${INSTALL_DOCREADMEDIR}
- COMPONENT Readme
-@@ -370,6 +366,7 @@
+ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
+ COMPONENT Readme)
+ INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+@@ -373,6 +368,7 @@
IF(UNIX)
- INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+ INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
ENDIF()
+ENDIF()
diff --git a/databases/mariadb55-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mariadb55-server/files/patch-cmake_os_FreeBSD.cmake
index dd8947d..5089f86 100644
--- a/databases/mariadb55-server/files/patch-cmake_os_FreeBSD.cmake
+++ b/databases/mariadb55-server/files/patch-cmake_os_FreeBSD.cmake
@@ -1,15 +1,16 @@
---- cmake/os/FreeBSD.cmake.orig 2013-01-13 02:13:17.000000000 +0200
-+++ cmake/os/FreeBSD.cmake 2013-01-13 02:14:15.000000000 +0200
-@@ -24,6 +24,7 @@
+--- cmake/os/FreeBSD.cmake.orig 2013-09-27 00:09:44.000000000 +0300
++++ cmake/os/FreeBSD.cmake 2013-09-27 00:09:57.000000000 +0300
+@@ -24,9 +24,10 @@
# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
# Find libexecinfo (library that contains backtrace_symbols etc)
-+IF(FALSE)
- INCLUDE_DIRECTORIES(/usr/local/include)
- SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
- SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
-@@ -31,6 +32,7 @@
+-INCLUDE_DIRECTORIES(/usr/local/include)
+-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
+-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
++SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
++INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
++SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
++SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
+ FIND_LIBRARY(EXECINFO NAMES execinfo)
IF(EXECINFO)
SET(LIBEXECINFO ${EXECINFO})
- ENDIF()
-+ENDIF()
diff --git a/databases/mariadb55-server/files/patch-sql_item_func.cc b/databases/mariadb55-server/files/patch-sql_item_func.cc
new file mode 100644
index 0000000..b3fc22d
--- /dev/null
+++ b/databases/mariadb55-server/files/patch-sql_item_func.cc
@@ -0,0 +1,11 @@
+--- ./sql/item_func.cc.orig 2013-08-19 16:44:21.000000000 -0400
++++ ./sql/item_func.cc 2013-08-19 16:44:33.000000000 -0400
+@@ -2341,7 +2341,7 @@
+
+ if (dec_negative && my_isinf(tmp))
+ tmp2= 0.0;
+- else if (!dec_negative && my_isinf(value_mul_tmp))
++ else if (!dec_negative && my_isinf((double)value_mul_tmp))
+ tmp2= value;
+ else if (truncate)
+ {
\ No newline at end of file
diff --git a/databases/mariadb55-server/files/patch-sql_item_subselect.cc b/databases/mariadb55-server/files/patch-sql_item_subselect.cc
new file mode 100644
index 0000000..6ab58d3
--- /dev/null
+++ b/databases/mariadb55-server/files/patch-sql_item_subselect.cc
@@ -0,0 +1,11 @@
+--- sql/item_subselect.cc.orig 2013-05-21 22:09:51.000000000 +0000
++++ sql/item_subselect.cc 2013-09-26 13:13:01.105197491 +0000
+@@ -1317,7 +1317,7 @@
+ Item_subselect()
+ {
+ DBUG_ENTER("Item_exists_subselect::Item_exists_subselect");
+- bool val_bool();
++// bool val_bool();
+ init(select_lex, new select_exists_subselect(this));
+ max_columns= UINT_MAX;
+ null_value= FALSE; //can't be NULL
diff --git a/databases/mariadb55-server/files/patch-sql_sql_trigger.cc b/databases/mariadb55-server/files/patch-sql_sql_trigger.cc
new file mode 100644
index 0000000..be49b1f
--- /dev/null
+++ b/databases/mariadb55-server/files/patch-sql_sql_trigger.cc
@@ -0,0 +1,50 @@
+--- sql/sql_trigger.cc.orig 2013-05-21 22:09:51.000000000 +0000
++++ sql/sql_trigger.cc 2013-09-26 13:15:55.450195525 +0000
+@@ -192,32 +192,32 @@
+ {
+ {
+ { C_STRING_WITH_LEN("triggers") },
+- my_offsetof(class Table_triggers_list, definitions_list),
++ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
+ FILE_OPTIONS_STRLIST
+ },
+ {
+ { C_STRING_WITH_LEN("sql_modes") },
+- my_offsetof(class Table_triggers_list, definition_modes_list),
++ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
+ FILE_OPTIONS_ULLLIST
+ },
+ {
+ { C_STRING_WITH_LEN("definers") },
+- my_offsetof(class Table_triggers_list, definers_list),
++ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
+ FILE_OPTIONS_STRLIST
+ },
+ {
+ { C_STRING_WITH_LEN("client_cs_names") },
+- my_offsetof(class Table_triggers_list, client_cs_names),
++ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
+ FILE_OPTIONS_STRLIST
+ },
+ {
+ { C_STRING_WITH_LEN("connection_cl_names") },
+- my_offsetof(class Table_triggers_list, connection_cl_names),
++ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
+ FILE_OPTIONS_STRLIST
+ },
+ {
+ { C_STRING_WITH_LEN("db_cl_names") },
+- my_offsetof(class Table_triggers_list, db_cl_names),
++ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
+ FILE_OPTIONS_STRLIST
+ },
+ { { 0, 0 }, 0, FILE_OPTIONS_STRING }
+@@ -226,7 +226,7 @@
+ File_option sql_modes_parameters=
+ {
+ { C_STRING_WITH_LEN("sql_modes") },
+- my_offsetof(class Table_triggers_list, definition_modes_list),
++ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
+ FILE_OPTIONS_ULLLIST
+ };
+
diff --git a/databases/mariadb55-server/files/patch-sql_sql_view.cc b/databases/mariadb55-server/files/patch-sql_sql_view.cc
new file mode 100644
index 0000000..8b6d0b8
--- /dev/null
+++ b/databases/mariadb55-server/files/patch-sql_sql_view.cc
@@ -0,0 +1,63 @@
+--- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000
++++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000
+@@ -742,46 +742,46 @@
+ */
+ static File_option view_parameters[]=
+ {{{ C_STRING_WITH_LEN("query")},
+- my_offsetof(TABLE_LIST, select_stmt),
++ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
+ FILE_OPTIONS_ESTRING},
+ {{ C_STRING_WITH_LEN("md5")},
+- my_offsetof(TABLE_LIST, md5),
++ static_cast<int>(my_offsetof(TABLE_LIST, md5)),
+ FILE_OPTIONS_STRING},
+ {{ C_STRING_WITH_LEN("updatable")},
+- my_offsetof(TABLE_LIST, updatable_view),
++ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
+ FILE_OPTIONS_ULONGLONG},
+ {{ C_STRING_WITH_LEN("algorithm")},
+- my_offsetof(TABLE_LIST, algorithm),
++ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
+ FILE_OPTIONS_VIEW_ALGO},
+ {{ C_STRING_WITH_LEN("definer_user")},
+- my_offsetof(TABLE_LIST, definer.user),
++ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
+ FILE_OPTIONS_STRING},
+ {{ C_STRING_WITH_LEN("definer_host")},
+- my_offsetof(TABLE_LIST, definer.host),
++ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
+ FILE_OPTIONS_STRING},
+ {{ C_STRING_WITH_LEN("suid")},
+- my_offsetof(TABLE_LIST, view_suid),
++ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
+ FILE_OPTIONS_ULONGLONG},
+ {{ C_STRING_WITH_LEN("with_check_option")},
+- my_offsetof(TABLE_LIST, with_check),
++ static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
+ FILE_OPTIONS_ULONGLONG},
+ {{ C_STRING_WITH_LEN("timestamp")},
+- my_offsetof(TABLE_LIST, timestamp),
++ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
+ FILE_OPTIONS_TIMESTAMP},
+ {{ C_STRING_WITH_LEN("create-version")},
+- my_offsetof(TABLE_LIST, file_version),
++ static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
+ FILE_OPTIONS_ULONGLONG},
+ {{ C_STRING_WITH_LEN("source")},
+- my_offsetof(TABLE_LIST, source),
++ static_cast<int>(my_offsetof(TABLE_LIST, source)),
+ FILE_OPTIONS_ESTRING},
+ {{(char*) STRING_WITH_LEN("client_cs_name")},
+- my_offsetof(TABLE_LIST, view_client_cs_name),
++ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
+ FILE_OPTIONS_STRING},
+ {{(char*) STRING_WITH_LEN("connection_cl_name")},
+- my_offsetof(TABLE_LIST, view_connection_cl_name),
++ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
+ FILE_OPTIONS_STRING},
+ {{(char*) STRING_WITH_LEN("view_body_utf8")},
+- my_offsetof(TABLE_LIST, view_body_utf8),
++ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
+ FILE_OPTIONS_ESTRING},
+ {{NullS, 0}, 0,
+ FILE_OPTIONS_STRING}
diff --git a/databases/mariadb55-server/pkg-plist b/databases/mariadb55-server/pkg-plist
index a7f2c49..c645a78 100644
--- a/databases/mariadb55-server/pkg-plist
+++ b/databases/mariadb55-server/pkg-plist
@@ -57,6 +57,7 @@ lib/mysql/plugin/qa_auth_server.so
lib/mysql/plugin/query_cache_info.so
lib/mysql/plugin/semisync_master.so
lib/mysql/plugin/semisync_slave.so
+lib/mysql/plugin/sphinx.so
lib/mysql/plugin/sql_errlog.so
libexec/mysqld
%%DATADIR%%/binary-configure
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309262323.r8QNNnXV011916>