Skip to content

Commit 5336d42

Browse files
committed
BUG#20456137: DUPLICATED CODE ON SQL/RPL_GROUP_REPLICATION.H
sql/rpl_group_replication.h contains duplicated functions signatures already defined on include/mysql/group_replication_priv.h There is no need for that since: 1) server files can access the functions through the regular include files; 2) plugins have access through include/mysql/group_replication_priv.h To solve the above duplication of code, the unneeded functions signatures are removed from sql/rpl_group_replication.h
1 parent 8845bfd commit 5336d42

File tree

2 files changed

+2
-72
lines changed

2 files changed

+2
-72
lines changed

sql/rpl_group_replication.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ uint get_group_replication_members_number_info()
221221

222222

223223
/*
224-
Server access methods
224+
Server methods exported to plugin through
225+
include/mysql/group_replication_priv.h
225226
*/
226227

227228
bool is_server_engine_ready()

sql/rpl_group_replication.h

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -67,75 +67,4 @@ bool get_group_replication_group_member_stats_info(GROUP_REPLICATION_GROUP_MEMBE
6767
uint get_group_replication_members_number_info();
6868

6969

70-
/*
71-
Server access methods and variables exported to plugin through
72-
include/mysql/group_replication_priv.h
73-
*/
74-
/**
75-
Returns if the server engine initialization as ended or not.
76-
77-
@return is the server ready
78-
@retval false not ready
79-
@retval true ready
80-
*/
81-
bool is_server_engine_ready();
82-
83-
/**
84-
Returns the server hostname, port and uuid.
85-
86-
@param[out] hostname
87-
@param[out] port
88-
@param[out] uuid
89-
*/
90-
void get_server_host_port_uuid(char **hostname, uint *port, char** uuid);
91-
92-
/**
93-
Returns a struct containing all server startup information needed to evaluate
94-
if one has conditions to proceed executing master-master replication.
95-
96-
@param[out] requirements
97-
*/
98-
void get_server_startup_prerequirements(Trans_context_info& requirements);
99-
100-
/**
101-
Returns the server GTID_EXECUTED encoded as a binary string.
102-
103-
@note Memory allocated to encoded_gtid_executed must be release by caller.
104-
105-
@param[out] encoded_gtid_executed binary string
106-
@param[out] length binary string length
107-
*/
108-
bool get_server_encoded_gtid_executed(uchar **encoded_gtid_executed,
109-
uint *length);
110-
#if !defined(DBUG_OFF)
111-
/**
112-
Returns a text representation of a encoded GTID set.
113-
114-
@note Memory allocated to returned pointer must be release by caller.
115-
116-
@param[in] encoded_gtid_set binary string
117-
@param[in] length binary string length
118-
119-
@return a pointer to text representation of the encoded set
120-
*/
121-
char* encoded_gtid_set_to_string(uchar *encoded_gtid_set, uint length);
122-
#endif
123-
124-
125-
/**
126-
Add thread to Global_THD_manager singleton.
127-
128-
@param[in] thd The thread
129-
*/
130-
void global_thd_manager_add_thd(THD *thd);
131-
132-
133-
/**
134-
Remove thread from Global_THD_manager singleton.
135-
136-
@param[in] thd The thread
137-
*/
138-
void global_thd_manager_remove_thd(THD *thd);
139-
140-
14170
#endif /* RPL_GROUP_REPLICATION_INCLUDED */

0 commit comments

Comments
 (0)