[Midnightbsd-cvs] mports [15536] U trunk/databases/mysql56-server: 5.6.14
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Oct 2 19:13:30 EDT 2013
Revision: 15536
http://svnweb.midnightbsd.org/mports/?rev=15536
Author: laffer1
Date: 2013-10-02 19:13:28 -0400 (Wed, 02 Oct 2013)
Log Message:
-----------
5.6.14
Modified Paths:
--------------
trunk/databases/mysql56-server/Makefile
trunk/databases/mysql56-server/distinfo
trunk/databases/mysql56-server/files/mysql-server.in
trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-sql_CMakeLists.txt
Added Paths:
-----------
trunk/databases/mysql56-server/files/patch-sql_sql_trigger.cc
trunk/databases/mysql56-server/files/patch-sql_sql_view.cc
Removed Paths:
-------------
trunk/databases/mysql56-server/files/patch-sql_mysqld.cc
Property Changed:
----------------
trunk/databases/mysql56-server/distinfo
trunk/databases/mysql56-server/files/mysql-server.in
trunk/databases/mysql56-server/files/patch-CMakeLists.txt
trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-cmake_plugin.cmake
trunk/databases/mysql56-server/files/patch-extra_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
trunk/databases/mysql56-server/files/patch-include_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-include_my_compare.h
trunk/databases/mysql56-server/files/patch-include_myisam.h
trunk/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-libservices_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-man_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
trunk/databases/mysql56-server/files/patch-scripts_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh
trunk/databases/mysql56-server/files/patch-sql_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-sql_sys_vars.cc
trunk/databases/mysql56-server/files/patch-support-files_CMakeLists.txt
trunk/databases/mysql56-server/pkg-plist
Modified: trunk/databases/mysql56-server/Makefile
===================================================================
--- trunk/databases/mysql56-server/Makefile 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/Makefile 2013-10-02 23:13:28 UTC (rev 15536)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.10
+PORTVERSION= 5.6.14
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -10,11 +10,11 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT?= Multithreaded SQL database (server)
+
LICENSE= gpl2
SLAVEDIRS= databases/mysql56-client
USE_CMAKE= yes
-MAKE_JOBS_SAFE= yes
CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
Modified: trunk/databases/mysql56-server/distinfo
===================================================================
--- trunk/databases/mysql56-server/distinfo 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/distinfo 2013-10-02 23:13:28 UTC (rev 15536)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.6.10.tar.gz) = 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6
-SIZE (mysql-5.6.10.tar.gz) = 35174149
+SHA256 (mysql-5.6.14.tar.gz) = 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7
+SIZE (mysql-5.6.14.tar.gz) = 36005278
Property changes on: trunk/databases/mysql56-server/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/databases/mysql56-server/files/mysql-server.in
===================================================================
--- trunk/databases/mysql56-server/files/mysql-server.in 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/mysql-server.in 2013-10-02 23:13:28 UTC (rev 15536)
@@ -16,6 +16,8 @@
# just before mysql starts.
# mysql_dbdir (str): Default to "/var/db/mysql"
# Base database directory.
+# mysql_optfile (str): Server-specific option file.
+# Default to "${mysql_dbdir}/my.cnf".
# mysql_pidfile (str): Custum PID file path and name.
# Default to "${mysql_dbdir}/${hostname}.pid".
# mysql_args (str): Custom additional arguments to be passed
@@ -32,17 +34,19 @@
: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
+: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
procname="%%PREFIX%%/libexec/mysqld"
start_precmd="${name}_prestart"
start_postcmd="${name}_poststart"
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
mysql_create_auth_tables()
{
Property changes on: trunk/databases/mysql56-server/files/mysql-server.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
@@ -1,14 +1,14 @@
---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100
-+++ client/CMakeLists.txt 2013-02-13 14:47:51.000000000 +0100
-@@ -33,17 +33,20 @@
+--- client/CMakeLists.txt.orig 2013-05-21 17:18:39.000000000 +0200
++++ client/CMakeLists.txt 2013-06-10 15:43:33.000000000 +0200
+@@ -31,17 +31,20 @@
+ COPY_OPENSSL_DLLS(copy_openssl_client)
- ADD_DEFINITIONS(${READLINE_DEFINES})
ADD_DEFINITIONS(${SSL_DEFINES})
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
TARGET_LINK_LIBRARIES(mysql mysqlclient)
IF(UNIX)
- TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
+ TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
ENDIF(UNIX)
+ENDIF()
@@ -21,7 +21,7 @@
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-@@ -52,17 +55,21 @@
+@@ -50,17 +53,21 @@
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@@ -43,7 +43,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -75,6 +82,7 @@
+@@ -73,6 +80,7 @@
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@@ -51,7 +51,7 @@
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
IF(WIN32)
-@@ -84,11 +92,6 @@
+@@ -82,11 +90,6 @@
SET_TARGET_PROPERTIES (
mysql_plugin
mysql_upgrade
Property changes on: trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-cmake_plugin.cmake
===================================================================
--- trunk/databases/mysql56-server/files/patch-cmake_plugin.cmake 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-cmake_plugin.cmake 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-cmake_plugin.cmake
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-extra_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-extra_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-extra_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-extra_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
===================================================================
--- trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-include_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-include_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-include_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-include_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-include_my_compare.h
===================================================================
--- trunk/databases/mysql56-server/files/patch-include_my_compare.h 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-include_my_compare.h 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-include_my_compare.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-include_myisam.h
===================================================================
--- trunk/databases/mysql56-server/files/patch-include_myisam.h 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-include_myisam.h 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-include_myisam.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
@@ -1,36 +1,41 @@
---- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100
-+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100
-@@ -153,13 +153,14 @@
+--- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200
++++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200
+@@ -173,7 +173,7 @@
+ ENDIF()
# Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
# Visual Studio users need debug static library for debug projects
IF(MSVC)
- INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
+@@ -200,19 +200,22 @@
+ ENDMACRO()
ENDIF()
+IF(FALSE)
IF(UNIX)
- MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
- SET(DOT_VERSION ".${VERSION}")
-@@ -174,9 +175,11 @@
- ENDMACRO()
- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
+ GET_TARGET_NAME(mysqlclient lib_name)
+ INSTALL_SYMLINK(mysqlclient
+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
+ ${INSTALL_LIBDIR} Development)
ENDIF()
+ENDIF()
IF(NOT DISABLE_SHARED)
-- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
-+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)
-+IF(FALSE)
+ # Merge several convenience libraries into one big mysqlclient
+ # and link them together into shared library.
+ MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+ EXPORTS ${CLIENT_API_FUNCTIONS}
+- COMPONENT SharedLibraries)
++ COMPONENT SharedLibraries NOINSTALL)
++ IF(FALSE)
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -223,3 +226,4 @@
+@@ -271,4 +274,5 @@
+ ${INSTALL_LIBDIR} SharedLibraries)
ENDFOREACH()
ENDIF()
++ ENDIF()
ENDIF()
-+ENDIF()
Property changes on: trunk/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-libservices_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-libservices_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-libservices_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-libservices_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-man_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-man_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-man_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-man_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-scripts_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-scripts_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-scripts_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-scripts_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh
===================================================================
--- trunk/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/databases/mysql56-server/files/patch-sql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-sql_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-sql_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
@@ -1,14 +1,14 @@
---- sql/CMakeLists.txt.orig 2010-12-23 17:31:28.000000000 +0100
-+++ sql/CMakeLists.txt 2010-12-23 17:33:36.000000000 +0100
-@@ -245,6 +245,7 @@
+--- sql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200
++++ sql/CMakeLists.txt 2013-04-19 15:08:12.000000000 +0200
+@@ -423,6 +423,7 @@
IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
+IF(FALSE)
- # We need to create empty directories (data/test) the installation.
- # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767
- # Avoid completely empty directories and install dummy file instead.
-@@ -286,6 +287,7 @@
+ # Copy db.opt into data/test/
+ SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt )
+ INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
+@@ -467,6 +468,7 @@
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
ENDIF()
ENDIF()
Property changes on: trunk/databases/mysql56-server/files/patch-sql_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/databases/mysql56-server/files/patch-sql_mysqld.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-sql_mysqld.cc 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-sql_mysqld.cc 2013-10-02 23:13:28 UTC (rev 15536)
@@ -1,11 +0,0 @@
---- sql/mysqld.cc.orig 2013-02-13 15:18:22.000000000 +0100
-+++ sql/mysqld.cc 2013-02-13 15:18:46.000000000 +0100
-@@ -6292,7 +6292,7 @@
- The connection was refused by TCP wrappers.
- There are no details (by client IP) available to update the host_cache.
- */
-- statistic_increment(connection_tcpwrap_errors, &LOCK_status);
-+ statistic_increment(connection_errors_tcpwrap, &LOCK_status);
- continue;
- }
- }
Added: trunk/databases/mysql56-server/files/patch-sql_sql_trigger.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-sql_sql_trigger.cc (rev 0)
+++ trunk/databases/mysql56-server/files/patch-sql_sql_trigger.cc 2013-10-02 23:13:28 UTC (rev 15536)
@@ -0,0 +1,50 @@
+--- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200
++++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200
+@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]=
+ {
+ {
+ { 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 @@ static File_option triggers_file_parameters[]=
+ 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
+ };
+
Added: trunk/databases/mysql56-server/files/patch-sql_sql_view.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-sql_sql_view.cc (rev 0)
+++ trunk/databases/mysql56-server/files/patch-sql_sql_view.cc 2013-10-02 23:13:28 UTC (rev 15536)
@@ -0,0 +1,63 @@
+--- sql/sql_view.cc.orig 2012-08-02 00:01:13.000000000 +0200
++++ sql/sql_view.cc 2012-09-11 17:01:13.000000000 +0200
+@@ -730,46 +730,46 @@ static const int required_view_parameters= 14;
+ */
+ 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_ULONGLONG},
+ {{ 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}
Index: trunk/databases/mysql56-server/files/patch-sql_sys_vars.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-sql_sys_vars.cc 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-sql_sys_vars.cc 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-sql_sys_vars.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/files/patch-support-files_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-support-files_CMakeLists.txt 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/files/patch-support-files_CMakeLists.txt 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/files/patch-support-files_CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/databases/mysql56-server/pkg-plist
===================================================================
--- trunk/databases/mysql56-server/pkg-plist 2013-09-27 12:45:28 UTC (rev 15535)
+++ trunk/databases/mysql56-server/pkg-plist 2013-10-02 23:13:28 UTC (rev 15536)
Property changes on: trunk/databases/mysql56-server/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list