Attachment #225009 for bug #255937

View | Details | Raw Unified | Return to bug 255937
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/databases/mysql80-client/Makefile (-1 lines)
1	# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"	1	# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
2		2
3	PORTNAME= mysql	3	PORTNAME= mysql
4	PORTREVISION= 1
5	PKGNAMESUFFIX= 80-client	4	PKGNAMESUFFIX= 80-client
6		5
7	COMMENT= Multithreaded SQL database (client)	6	COMMENT= Multithreaded SQL database (client)

Lines 3-8 bin/my_print_defaults Link Here

(-)b/databases/mysql80-client/pkg-plist (+1 lines)
3	bin/mysql	3	bin/mysql
4	bin/mysql_config	4	bin/mysql_config
5	bin/mysql_config_editor	5	bin/mysql_config_editor
		6	bin/mysql_migrate_keyring
6	bin/mysqladmin	7	bin/mysqladmin
7	bin/mysqlbinlog	8	bin/mysqlbinlog
8	bin/mysqlcheck	9	bin/mysqlcheck




# Created by: Mahdi Mokhtari <mokhi64@gmail.com>

PORTNAME?=		mysql
PORTVERSION=		8.0.25
PORTREVISION?=		0
CATEGORIES=		databases
MASTER_SITES=		MYSQL/MySQL-8.0
PKGNAMESUFFIX?=		80-server

BUILD_DEPENDS_powerpc64le=	libunwind>0:devel/libunwind

CMAKE_BUILD_TYPE=	Release
CFLAGS+=		-fPIC -DNDEBUG -malign-double

CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \


.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109 || ${ARCH} == "i386"
BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
CPP=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
.endif

.if ${ARCH} == "i386" && ${OSVERSION} < 1200000
# clang 7.x and 8.x do not build properly on 11i386
CPP=		clang-cpp${LLVM_DEFAULT}

Lines 1-3 Link Here

(-)b/databases/mysql80-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1611995725	1	TIMESTAMP = 1621139131
2	SHA256 (mysql-boost-8.0.23.tar.gz) = 1c7a424303c134758e59607a0b3172e43a21a27ff08e8c88c2439ffd4fc724a5	2	SHA256 (mysql-boost-8.0.25.tar.gz) = 93c5f57cbd69573a8d9798725edec52e92830f70c398a1afaaea2227db331728
3	SIZE (mysql-boost-8.0.23.tar.gz) = 291039175	3	SIZE (mysql-boost-8.0.25.tar.gz) = 290265324




--- client/CMakeLists.txt.orig	2021-03-22 08:44:50 UTC
+++ client/CMakeLists.txt
@@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING()
 ## Subdirectory with common client code.
 ADD_SUBDIRECTORY(base)
 ## Subdirectory for mysqlpump code.
+IF(WITHOUT_SERVER)
 ADD_SUBDIRECTORY(dump)
 ## Subdirectory for mysql_migrate_keyring code.
 ADD_SUBDIRECTORY(migrate_keyring)
+ENDIF()
 
+IF(NOT WITHOUT_CLIENTLIBS)
 MYSQL_ADD_EXECUTABLE(mysql
   ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
   completion_hash.cc
@@ -41,6 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysql
   client_query_attributes.cc
   LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
   )

 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
@@ -57,6 +61,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND
     )
 ENDIF()
 

 MYSQL_ADD_EXECUTABLE(mysqltest
   mysqltest.cc
   mysqltest/error_names.cc
@@ -73,6 +78,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
   ENABLE_EXPORTS
   LINK_LIBRARIES mysqlclient
   )

 MYSQL_ADD_EXECUTABLE(mysqlcheck
   check/mysqlcheck.cc
   check/mysqlcheck_core.cc
@@ -248,7 +256,9 @@ ENDIF()
 
 TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
 TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)

 MYSQL_ADD_EXECUTABLE(mysqladmin
   mysqladmin.cc
   LINK_LIBRARIES mysqlclient
@@ -261,6 +271,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
   mysql_config_editor.cc
   LINK_LIBRARIES mysqlclient
   )

 MYSQL_ADD_EXECUTABLE(mysql_secure_installation
   mysql_secure_installation.cc
   LINK_LIBRARIES mysqlclient
@@ -271,6 +284,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
   path.cc
   LINK_LIBRARIES mysys
   )




Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844

sql/mysqld.cc:6915:30: error: use of undeclared identifier 'TRUE'
    my_getopt_skip_unknown = TRUE;
                             ^

--- sql/mysqld.cc.orig	2020-06-16 16:31:03 UTC
+++ sql/mysqld.cc
@@ -6910,7 +6912,7 @@ int mysqld_main(int argc, char **argv)
   if (opt_keyring_migration_source || opt_keyring_migration_destination ||
       migrate_connect_options) {
     Migrate_keyring mk;
-    my_getopt_skip_unknown = TRUE;
+    my_getopt_skip_unknown = true;
     if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
                 opt_keyring_migration_destination, opt_keyring_migration_user,
                 opt_keyring_migration_host, opt_keyring_migration_password,




--- mysys/my_default.cc.orig	2021-04-23 15:06:40 UTC
+++ mysys/my_default.cc
@@ -204,7 +204,7 @@ bool no_defaults = false;
 
 /* Which directories are searched for options (and in which order) */
 
-#define MAX_DEFAULT_DIRS 6
+#define MAX_DEFAULT_DIRS 7
 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
 static const char **default_directories = nullptr;
 
@@ -915,6 +915,14 @@ static int search_default_file_with_ext(Process_option
       return 1; /* Ignore wrong files */
   }
 

+      goto err;
+  }
+
   while (true) {
     auto fileline = mysql_file_getline(buff, sizeof(buff), fp, is_login_file);
     char *linebuff = fileline.get();
@@ -1300,7 +1308,8 @@ void my_print_default_files(const char *conf_file) {
             end[(strlen(end) - 1)] = ' ';
           else
             strxmov(end, conf_file, *ext, " ", NullS);

         }
       }
     }
@@ -1640,14 +1649,9 @@ static const char **init_default_directories(MEM_ROOT 
 
 #else
 

 #endif
 
   if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);
@@ -1710,7 +1714,7 @@ int check_file_permissions(const char *file_name, bool
 #if !defined(_WIN32)
   MY_STAT stat_info;
 




--- sql/binlog.cc.orig	2021-03-22 08:44:50 UTC
+++ sql/binlog.cc
@@ -9156,8 +9156,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(
 
   char *missing_gtids = NULL;
   char *slave_executed_gtids = NULL;
-  gtid_missing.to_string(&missing_gtids, NULL);
-  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
+  gtid_missing.to_string(&missing_gtids);
+  slave_executed_gtid_set->to_string(&slave_executed_gtids);
 
   /*
      Log the information about the missing purged GTIDs to the error log.
@@ -9210,8 +9210,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(
   Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
   gtid_missing.add_gtid_set(slave_executed_gtid_set);
   gtid_missing.remove_gtid_set(previous_gtid_set);
-  gtid_missing.to_string(&missing_gtids, NULL);
-  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
+  gtid_missing.to_string(&missing_gtids);
+  slave_executed_gtid_set->to_string(&slave_executed_gtids);
 
   String tmp_uuid;
 




--- sql/item.h.orig	2020-12-11 07:42:20 UTC
+++ sql/item.h
@@ -3380,13 +3380,13 @@ class Item_sp_variable : public Item {
   Name_string m_name;
 
  public:
-#ifndef DBUG_OFF
+//#ifndef DBUG_OFF
   /*
     Routine to which this Item_splocal belongs. Used for checking if correct
     runtime context is used for variable handling.
   */
   sp_head *m_sp{nullptr};
-#endif
+//#endif
 
  public:
   Item_sp_variable(const Name_string sp_var_name);

Lines 8-13 bin/myisamlog Link Here

(-)b/databases/mysql80-server/pkg-plist (-1 / +2 lines)
8	bin/myisampack	8	bin/myisampack
9	bin/mysqldumpslow	9	bin/mysqldumpslow
10	bin/mysql_client_test	10	bin/mysql_client_test
		11	bin/mysql_keyring_encryption_test
11	bin/mysql_secure_installation	12	bin/mysql_secure_installation
12	bin/mysql_ssl_rsa_setup	13	bin/mysql_ssl_rsa_setup
13	bin/mysql_tzinfo_to_sql	14	bin/mysql_tzinfo_to_sql
Lines 58-63 lib/mysql/plugin/component_audit_api_message_emit.so Link Here
58	lib/mysql/plugin/component_example_component1.so	59	lib/mysql/plugin/component_example_component1.so
59	lib/mysql/plugin/component_example_component2.so	60	lib/mysql/plugin/component_example_component2.so
60	lib/mysql/plugin/component_example_component3.so	61	lib/mysql/plugin/component_example_component3.so
		62	lib/mysql/plugin/component_keyring_file.so
61	lib/mysql/plugin/component_log_filter_dragnet.so	63	lib/mysql/plugin/component_log_filter_dragnet.so
62	lib/mysql/plugin/component_log_sink_json.so	64	lib/mysql/plugin/component_log_sink_json.so
63	lib/mysql/plugin/component_log_sink_syseventlog.so	65	lib/mysql/plugin/component_log_sink_syseventlog.so
64	-

Return to bug 255937

Lines 1-8 Link Here

(-)b/databases/mysql80-server/Makefile (-10 / +3 lines)
1	# Created by: Mahdi Mokhtari <mokhi64@gmail.com>	1	# Created by: Mahdi Mokhtari <mokhi64@gmail.com>
2		2
3	PORTNAME?= mysql	3	PORTNAME?= mysql
4	PORTVERSION= 8.0.23	4	PORTVERSION= 8.0.25
5	PORTREVISION?= 1	5	PORTREVISION?= 0
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= MYSQL/MySQL-8.0	7	MASTER_SITES= MYSQL/MySQL-8.0
8	PKGNAMESUFFIX?= 80-server	8	PKGNAMESUFFIX?= 80-server
Lines 48-54 BUILD_DEPENDS_powerpc64= libunwind>0:devel/libunwind Link Here
48	BUILD_DEPENDS_powerpc64le= libunwind>0:devel/libunwind	48	BUILD_DEPENDS_powerpc64le= libunwind>0:devel/libunwind
49		49
50	CMAKE_BUILD_TYPE= Release	50	CMAKE_BUILD_TYPE= Release
51	CFLAGS+= -fPIC	51	CFLAGS+= -fPIC -DNDEBUG -malign-double
52		52
53	CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \	53	CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
54	-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \	54	-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
Lines 184-196 SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " Link Here
184		184
185	.include <bsd.port.pre.mk>	185	.include <bsd.port.pre.mk>
186		186
187	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109 \|\| ${ARCH} == "i386"
188	BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
189	CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
190	CPP= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
191	CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
192	.endif
193
194	.if ${ARCH} == "i386" && ${OSVERSION} < 1200000	187	.if ${ARCH} == "i386" && ${OSVERSION} < 1200000
195	# clang 7.x and 8.x do not build properly on 11i386	188	# clang 7.x and 8.x do not build properly on 11i386
196	CPP= clang-cpp${LLVM_DEFAULT}	189	CPP= clang-cpp${LLVM_DEFAULT}

Lines 1-18 Link Here

(-)b/databases/mysql80-server/files/patch-client_CMakeLists.txt (-8 / +10 lines)
1	--- client/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC	1	--- client/CMakeLists.txt.orig 2021-03-22 08:44:50 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -28,8 +28,11 @@ DISABLE_MISSING_PROFILE_WARNING()	3	@@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING()
4	## Subdirectory with common client code.	4	## Subdirectory with common client code.
5	ADD_SUBDIRECTORY(base)	5	ADD_SUBDIRECTORY(base)
6	## Subdirectory for mysqlpump code.	6	## Subdirectory for mysqlpump code.
7	+IF(WITHOUT_SERVER)	7	+IF(WITHOUT_SERVER)
8	ADD_SUBDIRECTORY(dump)	8	ADD_SUBDIRECTORY(dump)
		9	## Subdirectory for mysql_migrate_keyring code.
		10	ADD_SUBDIRECTORY(migrate_keyring)
9	+ENDIF()	11	+ENDIF()
10		12
11	+IF(NOT WITHOUT_CLIENTLIBS)	13	+IF(NOT WITHOUT_CLIENTLIBS)
12	MYSQL_ADD_EXECUTABLE(mysql	14	MYSQL_ADD_EXECUTABLE(mysql
13	${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc	15	${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
14	completion_hash.cc	16	completion_hash.cc
15	@@ -39,6 +42,7 @@ MYSQL_ADD_EXECUTABLE(mysql	17	@@ -41,6 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysql
16	client_query_attributes.cc	18	client_query_attributes.cc
17	LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}	19	LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
18	)	20	)
Lines 20-26 Link Here
20		22
21	IF(NOT WITHOUT_SERVER)	23	IF(NOT WITHOUT_SERVER)
22	MYSQL_ADD_EXECUTABLE(mysql_upgrade	24	MYSQL_ADD_EXECUTABLE(mysql_upgrade
23	@@ -55,6 +59,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND	25	@@ -57,6 +61,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND
24	)	26	)
25	ENDIF()	27	ENDIF()
26		28
Lines 28-34 Link Here
28	MYSQL_ADD_EXECUTABLE(mysqltest	30	MYSQL_ADD_EXECUTABLE(mysqltest
29	mysqltest.cc	31	mysqltest.cc
30	mysqltest/error_names.cc	32	mysqltest/error_names.cc
31	@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest	33	@@ -73,6 +78,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
32	ENABLE_EXPORTS	34	ENABLE_EXPORTS
33	LINK_LIBRARIES mysqlclient	35	LINK_LIBRARIES mysqlclient
34	)	36	)
Lines 38-44 Link Here
38	MYSQL_ADD_EXECUTABLE(mysqlcheck	40	MYSQL_ADD_EXECUTABLE(mysqlcheck
39	check/mysqlcheck.cc	41	check/mysqlcheck.cc
40	check/mysqlcheck_core.cc	42	check/mysqlcheck_core.cc
41	@@ -246,7 +254,9 @@ ENDIF()	43	@@ -248,7 +256,9 @@ ENDIF()
42		44
43	TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)	45	TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
44	TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)	46	TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
Lines 48-54 Link Here
48	MYSQL_ADD_EXECUTABLE(mysqladmin	50	MYSQL_ADD_EXECUTABLE(mysqladmin
49	mysqladmin.cc	51	mysqladmin.cc
50	LINK_LIBRARIES mysqlclient	52	LINK_LIBRARIES mysqlclient
51	@@ -259,6 +269,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor	53	@@ -261,6 +271,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
52	mysql_config_editor.cc	54	mysql_config_editor.cc
53	LINK_LIBRARIES mysqlclient	55	LINK_LIBRARIES mysqlclient
54	)	56	)
Lines 58-64 Link Here
58	MYSQL_ADD_EXECUTABLE(mysql_secure_installation	60	MYSQL_ADD_EXECUTABLE(mysql_secure_installation
59	mysql_secure_installation.cc	61	mysql_secure_installation.cc
60	LINK_LIBRARIES mysqlclient	62	LINK_LIBRARIES mysqlclient
61	@@ -269,6 +282,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup	63	@@ -271,6 +284,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
62	path.cc	64	path.cc
63	LINK_LIBRARIES mysys	65	LINK_LIBRARIES mysys
64	)	66	)

Removed Link Here

(-)a/databases/mysql80-server/files/patch-icu68 (-17 lines)
1	Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
2
3	sql/mysqld.cc:6915:30: error: use of undeclared identifier 'TRUE'
4	my_getopt_skip_unknown = TRUE;
5	^
6
7	--- sql/mysqld.cc.orig 2020-06-16 16:31:03 UTC
8	+++ sql/mysqld.cc
9	@@ -6910,7 +6912,7 @@ int mysqld_main(int argc, char **argv)
10	if (opt_keyring_migration_source \|\| opt_keyring_migration_destination \|\|
11	migrate_connect_options) {
12	Migrate_keyring mk;
13	- my_getopt_skip_unknown = TRUE;
14	+ my_getopt_skip_unknown = true;
15	if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
16	opt_keyring_migration_destination, opt_keyring_migration_user,
17	opt_keyring_migration_host, opt_keyring_migration_password,

Lines 1-15 Link Here

(-)b/databases/mysql80-server/files/patch-mysys_my__default.cc (-10 / +10 lines)
1	--- mysys/my_default.cc.orig 2019-09-20 08:30:51 UTC	1	--- mysys/my_default.cc.orig 2021-04-23 15:06:40 UTC
2	+++ mysys/my_default.cc	2	+++ mysys/my_default.cc
3	@@ -203,7 +203,7 @@ bool no_defaults = false;	3	@@ -204,7 +204,7 @@ bool no_defaults = false;
4		4
5	/* Which directories are searched for options (and in which order) */	5	/* Which directories are searched for options (and in which order) */
6		6
7	-#define MAX_DEFAULT_DIRS 6	7	-#define MAX_DEFAULT_DIRS 6
8	+#define MAX_DEFAULT_DIRS 7	8	+#define MAX_DEFAULT_DIRS 7
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;	10	static const char **default_directories = nullptr;
11		11
12	@@ -909,6 +909,14 @@ static int search_default_file_with_ext(Process_option	12	@@ -915,6 +915,14 @@ static int search_default_file_with_ext(Process_option
13	return 1; /* Ignore wrong files */	13	return 1; /* Ignore wrong files */
14	}	14	}
15		15
Lines 21-30 Link Here
21	+ goto err;	21	+ goto err;
22	+ }	22	+ }
23	+	23	+
24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) {	24	while (true) {
25	line++;	25	auto fileline = mysql_file_getline(buff, sizeof(buff), fp, is_login_file);
26	/* Ignore comment and empty lines */	26	char *linebuff = fileline.get();
27	@@ -1228,7 +1236,8 @@ void my_print_default_files(const char *conf_file) {	27	@@ -1300,7 +1308,8 @@ void my_print_default_files(const char *conf_file) {
28	end[(strlen(end) - 1)] = ' ';	28	end[(strlen(end) - 1)] = ' ';
29	else	29	else
30	strxmov(end, conf_file, *ext, " ", NullS);	30	strxmov(end, conf_file, *ext, " ", NullS);
Lines 34-40 Link Here
34	}	34	}
35	}	35	}
36	}	36	}
37	@@ -1565,14 +1574,9 @@ static const char **init_default_directories(MEM_ROOT	37	@@ -1640,14 +1649,9 @@ static const char **init_default_directories(MEM_ROOT
38		38
39	#else	39	#else
40		40
Lines 51-57 Link Here
51	#endif	51	#endif
52		52
53	if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);	53	if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);
54	@@ -1635,7 +1639,7 @@ int check_file_permissions(const char *file_name, bool	54	@@ -1710,7 +1714,7 @@ int check_file_permissions(const char *file_name, bool
55	#if !defined(_WIN32)	55	#if !defined(_WIN32)
56	MY_STAT stat_info;	56	MY_STAT stat_info;
57		57

Added Link Here

(-)b/databases/mysql80-server/files/patch-sql_binlog.cc (+24 lines)
1	--- sql/binlog.cc.orig 2021-03-22 08:44:50 UTC
2	+++ sql/binlog.cc
3	@@ -9156,8 +9156,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(
4
5	char *missing_gtids = NULL;
6	char *slave_executed_gtids = NULL;
7	- gtid_missing.to_string(&missing_gtids, NULL);
8	- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
9	+ gtid_missing.to_string(&missing_gtids);
10	+ slave_executed_gtid_set->to_string(&slave_executed_gtids);
11
12	/*
13	Log the information about the missing purged GTIDs to the error log.
14	@@ -9210,8 +9210,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(
15	Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
16	gtid_missing.add_gtid_set(slave_executed_gtid_set);
17	gtid_missing.remove_gtid_set(previous_gtid_set);
18	- gtid_missing.to_string(&missing_gtids, NULL);
19	- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
20	+ gtid_missing.to_string(&missing_gtids);
21	+ slave_executed_gtid_set->to_string(&slave_executed_gtids);
22
23	String tmp_uuid;
24

Removed Link Here

(-)a/databases/mysql80-server/files/patch-sql_item.h (-18 lines)
1	--- sql/item.h.orig 2020-12-11 07:42:20 UTC
2	+++ sql/item.h
3	@@ -3380,13 +3380,13 @@ class Item_sp_variable : public Item {
4	Name_string m_name;
5
6	public:
7	-#ifndef DBUG_OFF
8	+//#ifndef DBUG_OFF
9	/*
10	Routine to which this Item_splocal belongs. Used for checking if correct
11	runtime context is used for variable handling.
12	*/
13	sp_head *m_sp{nullptr};
14	-#endif
15	+//#endif
16
17	public:
18	Item_sp_variable(const Name_string sp_var_name);