Attachment 194832 Details for Bug 229219 – svn diff for databases/mariadb103-server

[patch] svn diff for databases/mariadb103-server

patch-databases_mariadb103-server-10.3.8 (text/plain), 13.31 KB, created by Bernard Spil on 2018-07-02 11:17:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2018-07-02 11:17:30 UTC

Size: 13.31 KB

patch

obsolete

>Index: databases/mariadb103-server/Makefile
>===================================================================
>--- databases/mariadb103-server/Makefile	(revision 473402)
>+++ databases/mariadb103-server/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	10.3.7
>+PORTVERSION=	10.3.8
> PORTREVISION?=	0
> CATEGORIES=	databases ipv6
> MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
>Index: databases/mariadb103-server/distinfo
>===================================================================
>--- databases/mariadb103-server/distinfo	(revision 473402)
>+++ databases/mariadb103-server/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1527449277
>-SHA256 (mariadb-10.3.7.tar.gz) = e990afee6ae7cf9ac40154d0e150be359385dd6ef408ad80ea30df34e2c164cf
>-SIZE (mariadb-10.3.7.tar.gz) = 71816160
>+TIMESTAMP = 1530525825
>+SHA256 (mariadb-10.3.8.tar.gz) = 44b409bc22775261b96f373bc01591065a680f46d295617b304cdf9ffb503ccf
>+SIZE (mariadb-10.3.8.tar.gz) = 72147179
>Index: databases/mariadb103-server/files/patch-sql-common_client.c
>===================================================================
>--- databases/mariadb103-server/files/patch-sql-common_client.c	(revision 473402)
>+++ databases/mariadb103-server/files/patch-sql-common_client.c	(nonexistent)
>@@ -1,13 +0,0 @@
>---- sql-common/client.c.orig	2017-05-14 23:13:18 UTC
>-+++ sql-common/client.c
>-@@ -104,6 +104,10 @@ my_bool	net_flush(NET *net);
>- #define CONNECT_TIMEOUT 0
>- #endif
>- 
>-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) || defined(HAVE_YASSL)
>-+#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X)
>-+#endif
>-+
>- #include "client_settings.h"
>- #include <ssl_compat.h>
>- #include <sql_common.h>
>
>Property changes on: databases/mariadb103-server/files/patch-sql-common_client.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: databases/mariadb103-server/files/patch-sql_mysqld.cc
>===================================================================
>--- databases/mariadb103-server/files/patch-sql_mysqld.cc	(revision 473402)
>+++ databases/mariadb103-server/files/patch-sql_mysqld.cc	(working copy)
>@@ -1,13 +1,5 @@
> --- sql/mysqld.cc.orig	2017-05-14 23:13:18 UTC
> +++ sql/mysqld.cc
>-@@ -120,6 +121,7 @@
>- #define HAVE_CLOSE_SERVER_SOCK 1
>- #endif
>- 
>-+
>- extern "C" {					// Because of SCO 3.2V4.2
>- #include <sys/stat.h>
>- #ifndef __GNU_LIBRARY__
> @@ -4838,8 +4840,9 @@ static void init_ssl()
>        while ((err= ERR_get_error()))
>          sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
>Index: databases/mariadb103-server/files/patch-sql_slave.cc
>===================================================================
>--- databases/mariadb103-server/files/patch-sql_slave.cc	(revision 473402)
>+++ databases/mariadb103-server/files/patch-sql_slave.cc	(nonexistent)
>@@ -1,14 +0,0 @@
>---- sql/slave.cc.orig	2017-05-14 23:13:18 UTC
>-+++ sql/slave.cc
>-@@ -14,6 +14,11 @@
>-    along with this program; if not, write to the Free Software
>-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
>- 
>-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
>-+#define ERR_remove_state(X)
>-+#elif defined(HAVE_ERR_remove_thread_state)
>-+#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
>-+#endif
>- 
>- /**
>-   @addtogroup Replication
>
>Property changes on: databases/mariadb103-server/files/patch-sql_slave.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: databases/mariadb103-server/files/patch-sql_sql__trigger.cc
>===================================================================
>--- databases/mariadb103-server/files/patch-sql_sql__trigger.cc	(revision 473402)
>+++ databases/mariadb103-server/files/patch-sql_sql__trigger.cc	(nonexistent)
>@@ -1,56 +0,0 @@
>---- sql/sql_trigger.cc.orig	2018-02-26 04:27:17.000000000 +0100
>-+++ sql/sql_trigger.cc	2018-02-27 20:54:20.250859000 +0100
>-@@ -178,37 +178,37 @@ static File_option triggers_file_paramet
>- {
>-   {
>-     { 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
>-   },
>-   {
>-     { 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
>-   },
>-   {
>-     { 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
>-   },
>-   {
>-     { 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
>-   },
>-   {
>-     { 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
>-   },
>-   {
>-     { 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
>-   },
>-   {
>-     { STRING_WITH_LEN("created") },
>--    my_offsetof(class Table_triggers_list, create_times),
>-+    static_cast<int>(my_offsetof(class Table_triggers_list, create_times)),
>-     FILE_OPTIONS_ULLLIST
>-   },
>-   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
>-@@ -217,7 +217,7 @@ static File_option triggers_file_paramet
>- File_option sql_modes_parameters=
>- {
>-   { 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
>- };
>- 
>
>Property changes on: databases/mariadb103-server/files/patch-sql_sql__trigger.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: databases/mariadb103-server/files/patch-sql_sql__view.cc
>===================================================================
>--- databases/mariadb103-server/files/patch-sql_sql__view.cc	(revision 473402)
>+++ databases/mariadb103-server/files/patch-sql_sql__view.cc	(nonexistent)
>@@ -1,67 +0,0 @@
>---- sql/sql_view.cc.orig	2018-02-26 04:27:17.000000000 +0100
>-+++ sql/sql_view.cc	2018-02-27 20:56:59.769528000 +0100
>-@@ -753,49 +753,49 @@ static const int required_view_parameter
>- */
>- static File_option view_parameters[]=
>- {{{ STRING_WITH_LEN("query")},
>--  my_offsetof(TABLE_LIST, select_stmt),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
>-   FILE_OPTIONS_ESTRING},
>-  {{ STRING_WITH_LEN("md5")},
>--  my_offsetof(TABLE_LIST, md5),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
>-   FILE_OPTIONS_STRING},
>-  {{ STRING_WITH_LEN("updatable")},
>--  my_offsetof(TABLE_LIST, updatable_view),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
>-   FILE_OPTIONS_ULONGLONG},
>-  {{ STRING_WITH_LEN("algorithm")},
>--  my_offsetof(TABLE_LIST, algorithm),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
>-   FILE_OPTIONS_VIEW_ALGO},
>-  {{ STRING_WITH_LEN("definer_user")},
>--  my_offsetof(TABLE_LIST, definer.user),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
>-   FILE_OPTIONS_STRING},
>-  {{ STRING_WITH_LEN("definer_host")},
>--  my_offsetof(TABLE_LIST, definer.host),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
>-   FILE_OPTIONS_STRING},
>-  {{ STRING_WITH_LEN("suid")},
>--  my_offsetof(TABLE_LIST, view_suid),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
>-   FILE_OPTIONS_ULONGLONG},
>-  {{ STRING_WITH_LEN("with_check_option")},
>--  my_offsetof(TABLE_LIST, with_check),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
>-   FILE_OPTIONS_ULONGLONG},
>-  {{ STRING_WITH_LEN("timestamp")},
>--  my_offsetof(TABLE_LIST, timestamp),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
>-   FILE_OPTIONS_TIMESTAMP},
>-  {{ STRING_WITH_LEN("create-version")},
>--  my_offsetof(TABLE_LIST, file_version),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
>-   FILE_OPTIONS_ULONGLONG},
>-  {{ 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},
>-  {{ STRING_WITH_LEN("mariadb-version")},
>--  my_offsetof(TABLE_LIST, mariadb_version),
>-+  static_cast<int>(my_offsetof(TABLE_LIST, mariadb_version)),
>-   FILE_OPTIONS_ULONGLONG},
>-  {{NullS, 0},			0,
>-   FILE_OPTIONS_STRING}
>
>Property changes on: databases/mariadb103-server/files/patch-sql_sql__view.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: databases/mariadb103-server/files/patch-sql_sys__vars.cc
>===================================================================
>--- databases/mariadb103-server/files/patch-sql_sys__vars.cc	(revision 473402)
>+++ databases/mariadb103-server/files/patch-sql_sys__vars.cc	(nonexistent)
>@@ -1,40 +0,0 @@
>-Fix clang build error
>-
>---- sql/sys_vars.cc.orig	2017-05-14 23:13:18 UTC
>-+++ sql/sys_vars.cc
>-@@ -1067,7 +1067,7 @@ static Sys_var_ulong Sys_interactive_tim
>-        "connection before closing it",
>-        NO_SET_STMT SESSION_VAR(net_interactive_timeout),
>-        CMD_LINE(REQUIRED_ARG),
>--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
>-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
>- 
>- static Sys_var_ulonglong Sys_join_buffer_size(
>-        "join_buffer_size",
>-@@ -2242,7 +2242,7 @@ static Sys_var_ulong Sys_net_read_timeou
>-        "Number of seconds to wait for more data from a connection before "
>-        "aborting the read",
>-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
>--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
>-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
>-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
>-        ON_UPDATE(fix_net_read_timeout));
>- 
>-@@ -2257,7 +2257,7 @@ static Sys_var_ulong Sys_net_write_timeo
>-        "Number of seconds to wait for a block to be written to a connection "
>-        "before aborting the write",
>-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
>--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
>-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
>-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
>-        ON_UPDATE(fix_net_write_timeout));
>- 
>-@@ -3505,7 +3505,7 @@ static Sys_var_ulong Sys_net_wait_timeou
>-        "The number of seconds the server waits for activity on a "
>-        "connection before closing it",
>-        NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
>--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
>-+       VALID_RANGE(1, INT_MAX32/1000),
>-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
>- 
>- static Sys_var_plugin Sys_default_storage_engine(
>
>Property changes on: databases/mariadb103-server/files/patch-sql_sys__vars.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: databases/mariadb103-server/pkg-plist
>===================================================================
>--- databases/mariadb103-server/pkg-plist	(revision 473402)
>+++ databases/mariadb103-server/pkg-plist	(working copy)
>@@ -41,6 +41,7 @@
> bin/resolve_stack_dump
> bin/resolveip
> %%ROCKSDB%%bin/sst_dump
>+@comment bin/test-connect-t
> %%TOKUDB%%bin/tokuft_logprint
> %%TOKUDB%%bin/tokuftdump
> bin/wsrep_sst_common
>@@ -47,6 +48,7 @@
> bin/wsrep_sst_mariabackup
> bin/wsrep_sst_mysqldump
> bin/wsrep_sst_rsync
>+bin/wsrep_sst_rsync_wan
> bin/wsrep_sst_xtrabackup
> bin/wsrep_sst_xtrabackup-v2
> @comment include/mysql/my_config.h

Actions: View | Diff

Attachments on bug 229219: 194832 | 194833