[Midnightbsd-cvs] mports [23287] trunk/databases/mysql56-server/files: update patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Apr 30 19:43:52 EDT 2018
Revision: 23287
http://svnweb.midnightbsd.org/mports/?rev=23287
Author: laffer1
Date: 2018-04-30 19:43:51 -0400 (Mon, 30 Apr 2018)
Log Message:
-----------
update patches
Modified Paths:
--------------
trunk/databases/mysql56-server/files/mysql-server.in
trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt
trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
Added Paths:
-----------
trunk/databases/mysql56-server/files/extra-patch-config.h.cmake
trunk/databases/mysql56-server/files/my.cnf.sample.in
trunk/databases/mysql56-server/files/patch-cmake_ssl.cmake
trunk/databases/mysql56-server/files/patch-sql-common_client__authentication.cc
Removed Paths:
-------------
trunk/databases/mysql56-server/files/patch-sql_sql_trigger.cc
trunk/databases/mysql56-server/files/patch-sql_sql_view.cc
Added: trunk/databases/mysql56-server/files/extra-patch-config.h.cmake
===================================================================
--- trunk/databases/mysql56-server/files/extra-patch-config.h.cmake (rev 0)
+++ trunk/databases/mysql56-server/files/extra-patch-config.h.cmake 2018-04-30 23:43:51 UTC (rev 23287)
@@ -0,0 +1,12 @@
+--- config.h.cmake.orig 2014-12-05 16:24:02 UTC
++++ config.h.cmake
+@@ -151,7 +151,8 @@
+ #cmakedefine HAVE_FESETROUND 1
+ #cmakedefine HAVE_FINITE 1
+ #cmakedefine HAVE_FP_EXCEPT 1
+-#cmakedefine HAVE_FPSETMASK 1
++#cmakedefine HAVE_FPSETMASK 0
++#cmakedefine HAVE_FEDISABLEEXCEPT 1
+ #cmakedefine HAVE_FSEEKO 1
+ #cmakedefine HAVE_FSYNC 1
+ #cmakedefine HAVE_FTIME 1
Property changes on: trunk/databases/mysql56-server/files/extra-patch-config.h.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/mysql56-server/files/my.cnf.sample.in
===================================================================
--- trunk/databases/mysql56-server/files/my.cnf.sample.in (rev 0)
+++ trunk/databases/mysql56-server/files/my.cnf.sample.in 2018-04-30 23:43:51 UTC (rev 23287)
@@ -0,0 +1,63 @@
+# $FreeBSD$
+
+[client]
+port = 3306
+socket = /tmp/mysql.sock
+
+[mysql]
+prompt = \u@\h [\d]>\_
+no_auto_rehash
+
+[mysqld]
+user = mysql
+port = 3306
+socket = /tmp/mysql.sock
+bind-address = 127.0.0.1
+basedir = %%PREFIX%%
+datadir = %%MY_DBDIR%%
+tmpdir = %%MY_TMPDIR%%
+slave-load-tmpdir = %%MY_TMPDIR%%
+secure-file-priv = %%MY_SECDIR%%
+log-bin = mysql-bin
+log-output = TABLE
+master-info-repository = TABLE
+relay-log-info-repository = TABLE
+relay-log-recovery = 1
+slow-query-log = 1
+server-id = 1
+sync_binlog = 1
+sync_relay_log = 1
+binlog_cache_size = 16M
+expire_logs_days = 30
+log-slave-updates = 1
+enforce-gtid-consistency = 1
+gtid-mode = ON
+safe-user-create = 1
+lower_case_table_names = 1
+explicit-defaults-for-timestamp = 1
+myisam-recover-options = BACKUP,FORCE
+open_files_limit = 32768
+table_open_cache = 16384
+table_definition_cache = 8192
+net_retry_count = 16384
+key_buffer_size = 256M
+max_allowed_packet = 64M
+query_cache_type = 0
+query_cache_size = 0
+long_query_time = 0.5
+innodb_buffer_pool_size = 1G
+innodb_data_home_dir = %%MY_DBDIR%%
+innodb_log_group_home_dir = %%MY_DBDIR%%
+innodb_data_file_path = ibdata1:128M:autoextend
+innodb_flush_method = O_DIRECT
+innodb_log_file_size = 256M
+innodb_log_buffer_size = 16M
+innodb_write_io_threads = 8
+innodb_read_io_threads = 8
+innodb_autoinc_lock_mode = 2
+skip-symbolic-links
+
+[mysqldump]
+max_allowed_packet = 256M
+quote_names
+quick
Property changes on: trunk/databases/mysql56-server/files/my.cnf.sample.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/mysql56-server/files/mysql-server.in
===================================================================
--- trunk/databases/mysql56-server/files/mysql-server.in 2018-04-30 23:43:04 UTC (rev 23286)
+++ trunk/databases/mysql56-server/files/mysql-server.in 2018-04-30 23:43:51 UTC (rev 23287)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $MidnightBSD$
+# $FreeBSD: head/databases/mysql56-server/files/mysql-server.in 466505 2018-04-04 20:45:14Z mmokhi $
#
# PROVIDE: mysql
@@ -11,13 +11,17 @@
# Add the following line to /etc/rc.conf to enable mysql:
# mysql_enable (bool): Set to "NO" by default.
# Set it to "YES" to enable MySQL.
-# mysql_limits (bool): Set to "NO" by default.
-# Set it to yes to run `limits -e -U mysql`
-# just before mysql starts.
-# mysql_dbdir (str): Default to "/var/db/mysql"
+%%LEGACY_LIMITS%%# mysql_limits (bool): Set to "NO" by default.
+%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%# just before mysql starts.
+# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
# Base database directory.
+# mysql_confdir (str): Default to "%%ETCDIR%%"
+# Base configuration directory.
# mysql_optfile (str): Server-specific option file.
-# Default to "${mysql_dbdir}/my.cnf".
+# Set it in the rc.conf or default behaviour of
+# `mysqld_safe` itself, will be picking
+# ${mysql_confdir}/my.cnf if it exists.
# 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,21 +36,29 @@
load_rc_config $name
: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
+: ${mysql_dbdir="%%MY_DBDIR%%"}
+: ${mysql_confdir="%%ETCDIR%%"}
+if [ -f "${mysql_confdir}/my.cnf" ]; then
+: ${mysql_optfile="${mysql_confdir}/my.cnf"}
+elif [ -f "${mysql_dbdir}/my.cnf" ]; then
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+fi
+if [ ! -z "${mysql_optfile}" ]; then
+mysql_extra="--defaults-extra-file=${mysql_optfile}"
+fi
mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
: ${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_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
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%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
+mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
mysql_create_auth_tables()
{
@@ -59,11 +71,12 @@
if [ ! -d "${mysql_dbdir}/mysql/." ]; then
mysql_create_auth_tables || return 1
fi
- if checkyesno mysql_limits; then
- eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
- else
- return 0
- fi
+%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
+%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%% else
+%%LEGACY_LIMITS%% return 0
+%%LEGACY_LIMITS%% fi
+%%MODERN_LIMITS%% return 0
}
mysql_poststart()
Modified: trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt 2018-04-30 23:43:04 UTC (rev 23286)
+++ trunk/databases/mysql56-server/files/patch-client_CMakeLists.txt 2018-04-30 23:43:51 UTC (rev 23287)
@@ -15,8 +15,8 @@
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ ADD_DEPENDENCIES(mysqltest GenError)
-
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
Added: trunk/databases/mysql56-server/files/patch-cmake_ssl.cmake
===================================================================
--- trunk/databases/mysql56-server/files/patch-cmake_ssl.cmake (rev 0)
+++ trunk/databases/mysql56-server/files/patch-cmake_ssl.cmake 2018-04-30 23:43:51 UTC (rev 23287)
@@ -0,0 +1,11 @@
+--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC
++++ cmake/ssl.cmake
+@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL)
+ IF(OPENSSL_INCLUDE_DIR AND
+ OPENSSL_LIBRARY AND
+ CRYPTO_LIBRARY AND
+- OPENSSL_MAJOR_VERSION STREQUAL "1"
++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+ )
+ SET(OPENSSL_FOUND TRUE)
+ ELSE()
Property changes on: trunk/databases/mysql56-server/files/patch-cmake_ssl.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc 2018-04-30 23:43:04 UTC (rev 23286)
+++ trunk/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc 2018-04-30 23:43:51 UTC (rev 23287)
@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100
-+++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100
-@@ -119,7 +119,7 @@
+--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC
++++ mysys_ssl/my_default.cc
+@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA
/* Which directories are searched for options (and in which order) */
@@ -9,18 +9,48 @@
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
static const char **default_directories = NULL;
-@@ -1395,7 +1395,10 @@
+@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
+ return 1; /* Ignore wrong files */
+ }
- #if defined(DEFAULT_SYSCONFDIR)
- if (DEFAULT_SYSCONFDIR[0])
++ if (strstr(name, "/etc") == name)
+ {
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++ fprintf(stderr,
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
++ goto err;
+ }
- #endif /* DEFAULT_SYSCONFDIR */
++
+ while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
+ {
+ line++;
+@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *
+ end[(strlen(end)-1)] = ' ';
+ else
+ strxmov(end, conf_file, *ext , " ", NullS);
+- fputs(name, stdout);
++ if (strstr(name, "/etc") != name)
++ fputs(name, stdout);
+ }
+ }
+ }
+@@ -1400,13 +1409,8 @@ static const char **init_default_directo
+ #else
+
+- errors += add_directory(alloc, "/etc/", dirs);
+- errors += add_directory(alloc, "/etc/mysql/", dirs);
+-
+-#if defined(DEFAULT_SYSCONFDIR)
+- if (DEFAULT_SYSCONFDIR[0])
+- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+-#endif /* DEFAULT_SYSCONFDIR */
++ errors += add_directory(alloc, "/usr/local/etc/", dirs);
++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
+
#endif
-@@ -1466,7 +1469,7 @@
+
+@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
MY_STAT stat_info;
if (!my_stat(file_name,&stat_info,MYF(0)))
Added: trunk/databases/mysql56-server/files/patch-sql-common_client__authentication.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-sql-common_client__authentication.cc (rev 0)
+++ trunk/databases/mysql56-server/files/patch-sql-common_client__authentication.cc 2018-04-30 23:43:51 UTC (rev 23287)
@@ -0,0 +1,17 @@
+sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int')
+ mysql->options.extension->server_public_key_path != '\0')
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~
+
+Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4
+
+--- sql-common/client_authentication.cc.orig 2017-09-13 15:49:17 UTC
++++ sql-common/client_authentication.cc
+@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
+
+ if (mysql->options.extension != NULL &&
+ mysql->options.extension->server_public_key_path != NULL &&
+- mysql->options.extension->server_public_key_path != '\0')
++ mysql->options.extension->server_public_key_path[0] != '\0')
+ {
+ pub_key_file= fopen(mysql->options.extension->server_public_key_path,
+ "r");
Property changes on: trunk/databases/mysql56-server/files/patch-sql-common_client__authentication.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/databases/mysql56-server/files/patch-sql_sql_trigger.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-sql_sql_trigger.cc 2018-04-30 23:43:04 UTC (rev 23286)
+++ trunk/databases/mysql56-server/files/patch-sql_sql_trigger.cc 2018-04-30 23:43:51 UTC (rev 23287)
@@ -1,50 +0,0 @@
---- 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
- };
-
Deleted: trunk/databases/mysql56-server/files/patch-sql_sql_view.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-sql_sql_view.cc 2018-04-30 23:43:04 UTC (rev 23286)
+++ trunk/databases/mysql56-server/files/patch-sql_sql_view.cc 2018-04-30 23:43:51 UTC (rev 23287)
@@ -1,63 +0,0 @@
---- 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}
More information about the Midnightbsd-cvs
mailing list