Skip to content

M
MariaDB
Commit c3ebd786 authored by Michael Widenius's avatar Michael Widenius
Browse files
Options

Remove THD argment from Log_event->net_send() and Protocol::pack_info() as 

THD is already available in Protocol
parent 0bf2b1c1
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 65 deletions
sql/log_event.cc
View file @ c3ebd786
...@@ -1016,7 +1016,7 @@ Log_event::do_shall_skip(rpl_group_info *rgi) ...@@ -1016,7 +1016,7 @@ Log_event::do_shall_skip(rpl_group_info *rgi)
Log_event::pack_info() Log_event::pack_info()
*/ */
void Log_event::pack_info(THD *thd, Protocol *protocol) void Log_event::pack_info(Protocol *protocol)
{ {
protocol->store("", &my_charset_bin); protocol->store("", &my_charset_bin);
} }
...@@ -1025,8 +1025,7 @@ void Log_event::pack_info(THD *thd, Protocol *protocol) ...@@ -1025,8 +1025,7 @@ void Log_event::pack_info(THD *thd, Protocol *protocol)
/** /**
Only called by SHOW BINLOG EVENTS Only called by SHOW BINLOG EVENTS
*/ */
int Log_event::net_send(THD *thd, Protocol *protocol, const char* log_name, int Log_event::net_send(Protocol *protocol, const char* log_name, my_off_t pos)
my_off_t pos)
{ {
const char *p= strrchr(log_name, FN_LIBCHAR); const char *p= strrchr(log_name, FN_LIBCHAR);
const char *event_type; const char *event_type;
...@@ -1040,7 +1039,7 @@ int Log_event::net_send(THD *thd, Protocol *protocol, const char* log_name, ...@@ -1040,7 +1039,7 @@ int Log_event::net_send(THD *thd, Protocol *protocol, const char* log_name,
protocol->store(event_type, strlen(event_type), &my_charset_bin); protocol->store(event_type, strlen(event_type), &my_charset_bin);
protocol->store((uint32) server_id); protocol->store((uint32) server_id);
protocol->store((ulonglong) log_pos); protocol->store((ulonglong) log_pos);
pack_info(thd, protocol); pack_info(protocol);
return protocol->write(); return protocol->write();
} }
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
...@@ -2813,7 +2812,7 @@ Log_event::continue_group(rpl_group_info *rgi) ...@@ -2813,7 +2812,7 @@ Log_event::continue_group(rpl_group_info *rgi)
show the catalog ?? show the catalog ??
*/ */
void Query_log_event::pack_info(THD *thd, Protocol *protocol) void Query_log_event::pack_info(Protocol *protocol)
{ {
// TODO: show the catalog ?? // TODO: show the catalog ??
char buf_mem[1024]; char buf_mem[1024];
...@@ -2823,7 +2822,7 @@ void Query_log_event::pack_info(THD *thd, Protocol *protocol) ...@@ -2823,7 +2822,7 @@ void Query_log_event::pack_info(THD *thd, Protocol *protocol)
&& db && db_len) && db && db_len)
{ {
buf.append(STRING_WITH_LEN("use ")); buf.append(STRING_WITH_LEN("use "));
append_identifier(thd, &buf, db, db_len); append_identifier(protocol->thd, &buf, db, db_len);
buf.append(STRING_WITH_LEN("; ")); buf.append(STRING_WITH_LEN("; "));
} }
if (query && q_len) if (query && q_len)
...@@ -4628,7 +4627,7 @@ Start_log_event_v3::Start_log_event_v3() ...@@ -4628,7 +4627,7 @@ Start_log_event_v3::Start_log_event_v3()
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Start_log_event_v3::pack_info(THD *thd, Protocol *protocol) void Start_log_event_v3::pack_info(Protocol *protocol)
{ {
char buf[12 + ST_SERVER_VER_LEN + 14 + 22], *pos; char buf[12 + ST_SERVER_VER_LEN + 14 + 22], *pos;
pos= strmov(buf, "Server ver: "); pos= strmov(buf, "Server ver: ");
...@@ -5392,7 +5391,7 @@ void Start_encryption_log_event::print(FILE* file, ...@@ -5392,7 +5391,7 @@ void Start_encryption_log_event::print(FILE* file,
**************************************************************************/ **************************************************************************/
/* /*
Load_log_event::pack_info() Load_log_event::print_query()
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
...@@ -5495,13 +5494,13 @@ void Load_log_event::print_query(THD *thd, bool need_db, const char *cs, ...@@ -5495,13 +5494,13 @@ void Load_log_event::print_query(THD *thd, bool need_db, const char *cs,
} }
void Load_log_event::pack_info(THD *thd, Protocol *protocol) void Load_log_event::pack_info(Protocol *protocol)
{ {
char query_buffer[1024]; char query_buffer[1024];
String query_str(query_buffer, sizeof(query_buffer), system_charset_info); String query_str(query_buffer, sizeof(query_buffer), system_charset_info);
query_str.length(0); query_str.length(0);
print_query(thd, TRUE, NULL, &query_str, 0, 0, NULL); print_query(protocol->thd, TRUE, NULL, &query_str, 0, 0, NULL);
protocol->store(query_str.ptr(), query_str.length(), &my_charset_bin); protocol->store(query_str.ptr(), query_str.length(), &my_charset_bin);
} }
#endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */ #endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
...@@ -6172,7 +6171,7 @@ Error '%s' running LOAD DATA INFILE on table '%s'. Default database: '%s'", ...@@ -6172,7 +6171,7 @@ Error '%s' running LOAD DATA INFILE on table '%s'. Default database: '%s'",
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Rotate_log_event::pack_info(THD *thd, Protocol *protocol) void Rotate_log_event::pack_info(Protocol *protocol)
{ {
StringBuffer<256> tmp(log_cs); StringBuffer<256> tmp(log_cs);
tmp.length(0); tmp.length(0);
...@@ -6384,7 +6383,7 @@ Rotate_log_event::do_shall_skip(rpl_group_info *rgi) ...@@ -6384,7 +6383,7 @@ Rotate_log_event::do_shall_skip(rpl_group_info *rgi)
**************************************************************************/ **************************************************************************/
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Binlog_checkpoint_log_event::pack_info(THD *thd, Protocol *protocol) void Binlog_checkpoint_log_event::pack_info(Protocol *protocol)
{ {
protocol->store(binlog_file_name, binlog_file_len, &my_charset_bin); protocol->store(binlog_file_name, binlog_file_len, &my_charset_bin);
} }
...@@ -6621,7 +6620,7 @@ Gtid_log_event::make_compatible_event(String *packet, bool *need_dummy_event, ...@@ -6621,7 +6620,7 @@ Gtid_log_event::make_compatible_event(String *packet, bool *need_dummy_event,
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void void
Gtid_log_event::pack_info(THD *thd, Protocol *protocol) Gtid_log_event::pack_info(Protocol *protocol)
{ {
char buf[6+5+10+1+10+1+20+1+4+20+1]; char buf[6+5+10+1+10+1+20+1+4+20+1];
char *p; char *p;
...@@ -7002,7 +7001,7 @@ Gtid_list_log_event::do_shall_skip(rpl_group_info *rgi) ...@@ -7002,7 +7001,7 @@ Gtid_list_log_event::do_shall_skip(rpl_group_info *rgi)
void void
Gtid_list_log_event::pack_info(THD *thd, Protocol *protocol) Gtid_list_log_event::pack_info(Protocol *protocol)
{ {
char buf_mem[1024]; char buf_mem[1024];
String buf(buf_mem, sizeof(buf_mem), system_charset_info); String buf(buf_mem, sizeof(buf_mem), system_charset_info);
...@@ -7112,7 +7111,7 @@ Gtid_list_log_event::peek(const char *event_start, uint32 event_len, ...@@ -7112,7 +7111,7 @@ Gtid_list_log_event::peek(const char *event_start, uint32 event_len,
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Intvar_log_event::pack_info(THD *thd, Protocol *protocol) void Intvar_log_event::pack_info(Protocol *protocol)
{ {
char buf[256], *pos; char buf[256], *pos;
pos= strmake(buf, get_var_type_name(), sizeof(buf)-23); pos= strmake(buf, get_var_type_name(), sizeof(buf)-23);
...@@ -7263,7 +7262,7 @@ Intvar_log_event::do_shall_skip(rpl_group_info *rgi) ...@@ -7263,7 +7262,7 @@ Intvar_log_event::do_shall_skip(rpl_group_info *rgi)
**************************************************************************/ **************************************************************************/
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Rand_log_event::pack_info(THD *thd, Protocol *protocol) void Rand_log_event::pack_info(Protocol *protocol)
{ {
char buf1[256], *pos; char buf1[256], *pos;
pos= strmov(buf1,"rand_seed1="); pos= strmov(buf1,"rand_seed1=");
...@@ -7382,7 +7381,7 @@ bool slave_execute_deferred_events(THD *thd) ...@@ -7382,7 +7381,7 @@ bool slave_execute_deferred_events(THD *thd)
**************************************************************************/ **************************************************************************/
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Xid_log_event::pack_info(THD *thd, Protocol *protocol) void Xid_log_event::pack_info(Protocol *protocol)
{ {
char buf[128], *pos; char buf[128], *pos;
pos= strmov(buf, "COMMIT /* xid="); pos= strmov(buf, "COMMIT /* xid=");
...@@ -7557,14 +7556,14 @@ user_var_append_name_part(THD *thd, String *buf, ...@@ -7557,14 +7556,14 @@ user_var_append_name_part(THD *thd, String *buf,
buf->append("="); buf->append("=");
} }
void User_var_log_event::pack_info(THD *thd, Protocol* protocol) void User_var_log_event::pack_info(Protocol* protocol)
{ {
if (is_null) if (is_null)
{ {
char buf_mem[FN_REFLEN+7]; char buf_mem[FN_REFLEN+7];
String buf(buf_mem, sizeof(buf_mem), system_charset_info); String buf(buf_mem, sizeof(buf_mem), system_charset_info);
buf.length(0); buf.length(0);
if (user_var_append_name_part(thd, &buf, name, name_len) || if (user_var_append_name_part(protocol->thd, &buf, name, name_len) ||
buf.append("NULL")) buf.append("NULL"))
return; return;
protocol->store(buf.ptr(), buf.length(), &my_charset_bin); protocol->store(buf.ptr(), buf.length(), &my_charset_bin);
...@@ -7580,7 +7579,7 @@ void User_var_log_event::pack_info(THD *thd, Protocol* protocol) ...@@ -7580,7 +7579,7 @@ void User_var_log_event::pack_info(THD *thd, Protocol* protocol)
String buf(buf_mem, sizeof(buf_mem), system_charset_info); String buf(buf_mem, sizeof(buf_mem), system_charset_info);
float8get(real_val, val); float8get(real_val, val);
buf.length(0); buf.length(0);
if (user_var_append_name_part(thd, &buf, name, name_len) || if (user_var_append_name_part(protocol->thd, &buf, name, name_len) ||
buf.append(buf2, my_gcvt(real_val, MY_GCVT_ARG_DOUBLE, buf.append(buf2, my_gcvt(real_val, MY_GCVT_ARG_DOUBLE,
MY_GCVT_MAX_FIELD_WIDTH, buf2, NULL))) MY_GCVT_MAX_FIELD_WIDTH, buf2, NULL)))
return; return;
...@@ -7593,7 +7592,7 @@ void User_var_log_event::pack_info(THD *thd, Protocol* protocol) ...@@ -7593,7 +7592,7 @@ void User_var_log_event::pack_info(THD *thd, Protocol* protocol)
char buf_mem[FN_REFLEN + 22]; char buf_mem[FN_REFLEN + 22];
String buf(buf_mem, sizeof(buf_mem), system_charset_info); String buf(buf_mem, sizeof(buf_mem), system_charset_info);
buf.length(0); buf.length(0);
if (user_var_append_name_part(thd, &buf, name, name_len) || if (user_var_append_name_part(protocol->thd, &buf, name, name_len) ||
buf.append(buf2, buf.append(buf2,
longlong10_to_str(uint8korr(val), buf2, longlong10_to_str(uint8korr(val), buf2,
((flags & User_var_log_event::UNSIGNED_F) ? 10 : -10))-buf2)) ((flags & User_var_log_event::UNSIGNED_F) ? 10 : -10))-buf2))
...@@ -7612,7 +7611,7 @@ void User_var_log_event::pack_info(THD *thd, Protocol* protocol) ...@@ -7612,7 +7611,7 @@ void User_var_log_event::pack_info(THD *thd, Protocol* protocol)
binary2my_decimal(E_DEC_FATAL_ERROR, (uchar*) (val+2), &dec, val[0], binary2my_decimal(E_DEC_FATAL_ERROR, (uchar*) (val+2), &dec, val[0],
val[1]); val[1]);
my_decimal2string(E_DEC_FATAL_ERROR, &dec, 0, 0, 0, &str); my_decimal2string(E_DEC_FATAL_ERROR, &dec, 0, 0, 0, &str);
if (user_var_append_name_part(thd, &buf, name, name_len) || if (user_var_append_name_part(protocol->thd, &buf, name, name_len) ||
buf.append(buf2)) buf.append(buf2))
return; return;
protocol->store(buf.ptr(), buf.length(), &my_charset_bin); protocol->store(buf.ptr(), buf.length(), &my_charset_bin);
...@@ -7634,7 +7633,7 @@ void User_var_log_event::pack_info(THD *thd, Protocol* protocol) ...@@ -7634,7 +7633,7 @@ void User_var_log_event::pack_info(THD *thd, Protocol* protocol)
{ {
size_t old_len; size_t old_len;
char *beg, *end; char *beg, *end;
if (user_var_append_name_part(thd, &buf, name, name_len) || if (user_var_append_name_part(protocol->thd, &buf, name, name_len) ||
buf.append("_") || buf.append("_") ||
buf.append(cs->csname) || buf.append(cs->csname) ||
buf.append(" ")) buf.append(" "))
...@@ -8310,7 +8309,7 @@ void Create_file_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info ...@@ -8310,7 +8309,7 @@ void Create_file_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Create_file_log_event::pack_info(THD *thd, Protocol *protocol) void Create_file_log_event::pack_info(Protocol *protocol)
{ {
char buf[SAFE_NAME_LEN*2 + 30 + 21*2], *pos; char buf[SAFE_NAME_LEN*2 + 30 + 21*2], *pos;
pos= strmov(buf, "db="); pos= strmov(buf, "db=");
...@@ -8498,7 +8497,7 @@ void Append_block_log_event::print(FILE* file, ...@@ -8498,7 +8497,7 @@ void Append_block_log_event::print(FILE* file,
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Append_block_log_event::pack_info(THD *thd, Protocol *protocol) void Append_block_log_event::pack_info(Protocol *protocol)
{ {
char buf[256]; char buf[256];
uint length; uint length;
...@@ -8655,7 +8654,7 @@ void Delete_file_log_event::print(FILE* file, ...@@ -8655,7 +8654,7 @@ void Delete_file_log_event::print(FILE* file,
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Delete_file_log_event::pack_info(THD *thd, Protocol *protocol) void Delete_file_log_event::pack_info(Protocol *protocol)
{ {
char buf[64]; char buf[64];
uint length; uint length;
...@@ -8756,7 +8755,7 @@ void Execute_load_log_event::print(FILE* file, ...@@ -8756,7 +8755,7 @@ void Execute_load_log_event::print(FILE* file,
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Execute_load_log_event::pack_info(THD *thd, Protocol *protocol) void Execute_load_log_event::pack_info(Protocol *protocol)
{ {
char buf[64]; char buf[64];
uint length; uint length;
...@@ -9019,7 +9018,7 @@ void Execute_load_query_log_event::print(FILE* file, ...@@ -9019,7 +9018,7 @@ void Execute_load_query_log_event::print(FILE* file,
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Execute_load_query_log_event::pack_info(THD *thd, Protocol *protocol) void Execute_load_query_log_event::pack_info(Protocol *protocol)
{ {
char buf_mem[1024]; char buf_mem[1024];
String buf(buf_mem, sizeof(buf_mem), system_charset_info); String buf(buf_mem, sizeof(buf_mem), system_charset_info);
...@@ -9027,7 +9026,7 @@ void Execute_load_query_log_event::pack_info(THD *thd, Protocol *protocol) ...@@ -9027,7 +9026,7 @@ void Execute_load_query_log_event::pack_info(THD *thd, Protocol *protocol)
if (db && db_len) if (db && db_len)
{ {
if (buf.append(STRING_WITH_LEN("use ")) || if (buf.append(STRING_WITH_LEN("use ")) ||
append_identifier(thd, &buf, db, db_len) || append_identifier(protocol->thd, &buf, db, db_len) ||
buf.append(STRING_WITH_LEN("; "))) buf.append(STRING_WITH_LEN("; ")))
return; return;
} }
...@@ -10204,7 +10203,7 @@ bool Rows_log_event::write_data_body() ...@@ -10204,7 +10203,7 @@ bool Rows_log_event::write_data_body()
#endif #endif
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Rows_log_event::pack_info(THD *thd, Protocol *protocol) void Rows_log_event::pack_info(Protocol *protocol)
{ {
char buf[256]; char buf[256];
char const *const flagstr= char const *const flagstr=
...@@ -10308,7 +10307,7 @@ bool Annotate_rows_log_event::write_data_body() ...@@ -10308,7 +10307,7 @@ bool Annotate_rows_log_event::write_data_body()
#endif #endif
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
void Annotate_rows_log_event::pack_info(THD *thd, Protocol* protocol) void Annotate_rows_log_event::pack_info(Protocol* protocol)
{ {
if (m_query_txt && m_query_len) if (m_query_txt && m_query_len)
protocol->store(m_query_txt, m_query_len, &my_charset_bin); protocol->store(m_query_txt, m_query_len, &my_charset_bin);
...@@ -11069,7 +11068,7 @@ bool Table_map_log_event::write_data_body() ...@@ -11069,7 +11068,7 @@ bool Table_map_log_event::write_data_body()
*/ */
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Table_map_log_event::pack_info(THD *thd, Protocol *protocol) void Table_map_log_event::pack_info(Protocol *protocol)
{ {
char buf[256]; char buf[256];
size_t bytes= my_snprintf(buf, sizeof(buf), size_t bytes= my_snprintf(buf, sizeof(buf),
...@@ -12532,7 +12531,7 @@ Incident_log_event::description() const ...@@ -12532,7 +12531,7 @@ Incident_log_event::description() const
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT
void Incident_log_event::pack_info(THD *thd, Protocol *protocol) void Incident_log_event::pack_info(Protocol *protocol)
{ {
char buf[256]; char buf[256];
size_t bytes; size_t bytes;
...@@ -12663,7 +12662,7 @@ Ignorable_log_event::~Ignorable_log_event() ...@@ -12663,7 +12662,7 @@ Ignorable_log_event::~Ignorable_log_event()
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT
/* Pack info for its unrecognized ignorable event */ /* Pack info for its unrecognized ignorable event */
void Ignorable_log_event::pack_info(THD *thd, Protocol *protocol) void Ignorable_log_event::pack_info(Protocol *protocol)
{ {
char buf[256]; char buf[256];
size_t bytes; size_t bytes;
......
sql/log_event.h
View file @ c3ebd786
...@@ -1129,15 +1129,14 @@ class Log_event ...@@ -1129,15 +1129,14 @@ class Log_event
*/ */
static void init_show_field_list(THD *thd, List<Item>* field_list); static void init_show_field_list(THD *thd, List<Item>* field_list);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
int net_send(THD *thd, Protocol *protocol, const char* log_name, int net_send(Protocol *protocol, const char* log_name, my_off_t pos);
my_off_t pos);
/* /*
pack_info() is used by SHOW BINLOG EVENTS; as print() it prepares and sends pack_info() is used by SHOW BINLOG EVENTS; as print() it prepares and sends
a string to display to the user, so it resembles print(). a string to display to the user, so it resembles print().
*/ */
virtual void pack_info(THD *thd, Protocol *protocol); virtual void pack_info(Protocol *protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
virtual const char* get_db() virtual const char* get_db()
...@@ -1977,7 +1976,7 @@ class Query_log_event: public Log_event ...@@ -1977,7 +1976,7 @@ class Query_log_event: public Log_event
bool using_trans, bool direct, bool suppress_use, int error); bool using_trans, bool direct, bool suppress_use, int error);
const char* get_db() { return db; } const char* get_db() { return db; }
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print_query_header(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info); void print_query_header(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -2355,7 +2354,7 @@ class Load_log_event: public Log_event ...@@ -2355,7 +2354,7 @@ class Load_log_event: public Log_event
Name_resolution_context *context); Name_resolution_context *context);
const char* get_db() { return db; } const char* get_db() { return db; }
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -2452,7 +2451,7 @@ class Start_log_event_v3: public Log_event ...@@ -2452,7 +2451,7 @@ class Start_log_event_v3: public Log_event
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
Start_log_event_v3(); Start_log_event_v3();
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
Start_log_event_v3() {} Start_log_event_v3() {}
...@@ -2710,7 +2709,7 @@ Intvar_log_event(THD* thd_arg,uchar type_arg, ulonglong val_arg, ...@@ -2710,7 +2709,7 @@ Intvar_log_event(THD* thd_arg,uchar type_arg, ulonglong val_arg,
cache_type= Log_event::EVENT_NO_CACHE; cache_type= Log_event::EVENT_NO_CACHE;
} }
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -2791,7 +2790,7 @@ class Rand_log_event: public Log_event ...@@ -2791,7 +2790,7 @@ class Rand_log_event: public Log_event
cache_type= Log_event::EVENT_NO_CACHE; cache_type= Log_event::EVENT_NO_CACHE;
} }
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -2841,7 +2840,7 @@ class Xid_log_event: public Log_event ...@@ -2841,7 +2840,7 @@ class Xid_log_event: public Log_event
cache_type= Log_event::EVENT_NO_CACHE; cache_type= Log_event::EVENT_NO_CACHE;
} }
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -2904,7 +2903,7 @@ class User_var_log_event: public Log_event ...@@ -2904,7 +2903,7 @@ class User_var_log_event: public Log_event
if (direct) if (direct)
cache_type= Log_event::EVENT_NO_CACHE; cache_type= Log_event::EVENT_NO_CACHE;
} }
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
#endif #endif
...@@ -3047,7 +3046,7 @@ class Rotate_log_event: public Log_event ...@@ -3047,7 +3046,7 @@ class Rotate_log_event: public Log_event
uint ident_len_arg, uint ident_len_arg,
ulonglong pos_arg, uint flags); ulonglong pos_arg, uint flags);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -3087,7 +3086,7 @@ class Binlog_checkpoint_log_event: public Log_event ...@@ -3087,7 +3086,7 @@ class Binlog_checkpoint_log_event: public Log_event
Binlog_checkpoint_log_event(const char *binlog_file_name_arg, Binlog_checkpoint_log_event(const char *binlog_file_name_arg,
uint binlog_file_len_arg); uint binlog_file_len_arg);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol *protocol); void pack_info(Protocol *protocol);
#endif #endif
#else #else
void print(FILE *file, PRINT_EVENT_INFO *print_event_info); void print(FILE *file, PRINT_EVENT_INFO *print_event_info);
...@@ -3209,7 +3208,7 @@ class Gtid_log_event: public Log_event ...@@ -3209,7 +3208,7 @@ class Gtid_log_event: public Log_event
Gtid_log_event(THD *thd_arg, uint64 seq_no, uint32 domain_id, bool standalone, Gtid_log_event(THD *thd_arg, uint64 seq_no, uint32 domain_id, bool standalone,
uint16 flags, bool is_transactional, uint64 commit_id); uint16 flags, bool is_transactional, uint64 commit_id);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol *protocol); void pack_info(Protocol *protocol);
virtual int do_apply_event(rpl_group_info *rgi); virtual int do_apply_event(rpl_group_info *rgi);
virtual int do_update_pos(rpl_group_info *rgi); virtual int do_update_pos(rpl_group_info *rgi);
virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi); virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
...@@ -3322,7 +3321,7 @@ class Gtid_list_log_event: public Log_event ...@@ -3322,7 +3321,7 @@ class Gtid_list_log_event: public Log_event
Gtid_list_log_event(rpl_binlog_state *gtid_set, uint32 gl_flags); Gtid_list_log_event(rpl_binlog_state *gtid_set, uint32 gl_flags);
Gtid_list_log_event(slave_connection_state *gtid_set, uint32 gl_flags); Gtid_list_log_event(slave_connection_state *gtid_set, uint32 gl_flags);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol *protocol); void pack_info(Protocol *protocol);
#endif #endif
#else #else
void print(FILE *file, PRINT_EVENT_INFO *print_event_info); void print(FILE *file, PRINT_EVENT_INFO *print_event_info);
...@@ -3386,7 +3385,7 @@ class Create_file_log_event: public Load_log_event ...@@ -3386,7 +3385,7 @@ class Create_file_log_event: public Load_log_event
uchar* block_arg, uint block_len_arg, uchar* block_arg, uint block_len_arg,
bool using_trans); bool using_trans);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -3458,7 +3457,7 @@ class Append_block_log_event: public Log_event ...@@ -3458,7 +3457,7 @@ class Append_block_log_event: public Log_event
Append_block_log_event(THD* thd, const char* db_arg, uchar* block_arg, Append_block_log_event(THD* thd, const char* db_arg, uchar* block_arg,
uint block_len_arg, bool using_trans); uint block_len_arg, bool using_trans);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
virtual int get_create_or_append() const; virtual int get_create_or_append() const;
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
...@@ -3499,7 +3498,7 @@ class Delete_file_log_event: public Log_event ...@@ -3499,7 +3498,7 @@ class Delete_file_log_event: public Log_event
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
Delete_file_log_event(THD* thd, const char* db_arg, bool using_trans); Delete_file_log_event(THD* thd, const char* db_arg, bool using_trans);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -3540,7 +3539,7 @@ class Execute_load_log_event: public Log_event ...@@ -3540,7 +3539,7 @@ class Execute_load_log_event: public Log_event
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
Execute_load_log_event(THD* thd, const char* db_arg, bool using_trans); Execute_load_log_event(THD* thd, const char* db_arg, bool using_trans);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -3636,7 +3635,7 @@ class Execute_load_query_log_event: public Query_log_event ...@@ -3636,7 +3635,7 @@ class Execute_load_query_log_event: public Query_log_event
bool using_trans, bool direct, bool using_trans, bool direct,
bool suppress_use, int errcode); bool suppress_use, int errcode);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(THD *thd, Protocol* protocol); void pack_info(Protocol* protocol);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#else #else
void print(FILE* file, PRINT_EVENT_INFO* print_event_info); void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
...@@ -3723,7 +3722,7 @@ class Annotate_rows_log_event: public Log_event ...@@ -3723,7 +3722,7 @@ class Annotate_rows_log_event: public Log_event
#endif #endif
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
virtual void pack_info(THD *thd, Protocol*); virtual void pack_info(Protocol*);
#endif #endif
#ifdef MYSQL_CLIENT #ifdef MYSQL_CLIENT
...@@ -4140,7 +4139,7 @@ class Table_map_log_event : public Log_event ...@@ -4140,7 +4139,7 @@ class Table_map_log_event : public Log_event
#endif #endif
#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
virtual void pack_info(THD *thd, Protocol *protocol); virtual void pack_info(Protocol *protocol);
#endif #endif
#ifdef MYSQL_CLIENT #ifdef MYSQL_CLIENT
...@@ -4255,7 +4254,7 @@ class Rows_log_event : public Log_event ...@@ -4255,7 +4254,7 @@ class Rows_log_event : public Log_event
virtual Log_event_type get_general_type_code() = 0; /* General rows op type, no version */ virtual Log_event_type get_general_type_code() = 0; /* General rows op type, no version */
#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
virtual void pack_info(THD *thd, Protocol *protocol); virtual void pack_info(Protocol *protocol);
#endif #endif
#ifdef MYSQL_CLIENT #ifdef MYSQL_CLIENT
...@@ -4795,7 +4794,7 @@ class Incident_log_event : public Log_event { ...@@ -4795,7 +4794,7 @@ class Incident_log_event : public Log_event {
#endif #endif
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
void pack_info(THD *thd, Protocol*); void pack_info(Protocol*);
virtual bool write_data_header(); virtual bool write_data_header();
virtual bool write_data_body(); virtual bool write_data_body();
...@@ -4870,7 +4869,7 @@ class Ignorable_log_event : public Log_event { ...@@ -4870,7 +4869,7 @@ class Ignorable_log_event : public Log_event {
virtual ~Ignorable_log_event(); virtual ~Ignorable_log_event();
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT
void pack_info(THD *, Protocol*); void pack_info(Protocol*);
#endif #endif
#ifdef MYSQL_CLIENT #ifdef MYSQL_CLIENT
......
sql/log_event_old.cc
View file @ c3ebd786
...@@ -1804,7 +1804,7 @@ bool Old_rows_log_event::write_data_body() ...@@ -1804,7 +1804,7 @@ bool Old_rows_log_event::write_data_body()
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Old_rows_log_event::pack_info(THD *thd, Protocol *protocol) void Old_rows_log_event::pack_info(Protocol *protocol)
{ {
char buf[256]; char buf[256];
char const *const flagstr= char const *const flagstr=
......
sql/log_event_old.h
View file @ c3ebd786
...@@ -111,7 +111,7 @@ class Old_rows_log_event : public Log_event ...@@ -111,7 +111,7 @@ class Old_rows_log_event : public Log_event
flag_set get_flags(flag_set flags_arg) const { return m_flags & flags_arg; } flag_set get_flags(flag_set flags_arg) const { return m_flags & flags_arg; }
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
virtual void pack_info(THD *thd, Protocol *protocol); virtual void pack_info(Protocol *protocol);
#endif #endif
#ifdef MYSQL_CLIENT #ifdef MYSQL_CLIENT
......
sql/protocol.h
View file @ c3ebd786
...@@ -33,7 +33,6 @@ typedef struct st_mysql_rows MYSQL_ROWS; ...@@ -33,7 +33,6 @@ typedef struct st_mysql_rows MYSQL_ROWS;
class Protocol class Protocol
{ {
protected: protected:
THD *thd;
String *packet; String *packet;
/* Used by net_store_data() for charset conversions */ /* Used by net_store_data() for charset conversions */
String *convert; String *convert;
...@@ -71,7 +70,7 @@ class Protocol ...@@ -71,7 +70,7 @@ class Protocol
const char *sql_state); const char *sql_state);
public: public:
Protocol() {} THD *thd;
Protocol(THD *thd_arg) { init(thd_arg); } Protocol(THD *thd_arg) { init(thd_arg); }
virtual ~Protocol() {} virtual ~Protocol() {}
void init(THD* thd_arg); void init(THD* thd_arg);
...@@ -151,7 +150,6 @@ class Protocol ...@@ -151,7 +150,6 @@ class Protocol
class Protocol_text :public Protocol class Protocol_text :public Protocol
{ {
public: public:
Protocol_text() {}
Protocol_text(THD *thd_arg) :Protocol(thd_arg) {} Protocol_text(THD *thd_arg) :Protocol(thd_arg) {}
virtual void prepare_for_resend(); virtual void prepare_for_resend();
virtual bool store_null(); virtual bool store_null();
...@@ -183,7 +181,6 @@ class Protocol_binary :public Protocol ...@@ -183,7 +181,6 @@ class Protocol_binary :public Protocol
private: private:
uint bit_fields; uint bit_fields;
public: public:
Protocol_binary() {}
Protocol_binary(THD *thd_arg) :Protocol(thd_arg) {} Protocol_binary(THD *thd_arg) :Protocol(thd_arg) {}
virtual bool prepare_for_send(uint num_columns); virtual bool prepare_for_send(uint num_columns);
virtual void prepare_for_resend(); virtual void prepare_for_resend();
......
sql/sql_class.cc
View file @ c3ebd786
...@@ -856,6 +856,7 @@ THD::THD(bool is_wsrep_applier) ...@@ -856,6 +856,7 @@ THD::THD(bool is_wsrep_applier)
:Statement(&main_lex, &main_mem_root, STMT_CONVENTIONAL_EXECUTION, :Statement(&main_lex, &main_mem_root, STMT_CONVENTIONAL_EXECUTION,
/* statement id */ 0), /* statement id */ 0),
rli_fake(0), rgi_fake(0), rgi_slave(NULL), rli_fake(0), rgi_fake(0), rgi_slave(NULL),
protocol_text(this), protocol_binary(this),
in_sub_stmt(0), log_all_errors(0), in_sub_stmt(0), log_all_errors(0),
binlog_unsafe_warning_flags(0), binlog_unsafe_warning_flags(0),
binlog_table_maps(0), binlog_table_maps(0),
......
sql/sql_repl.cc
View file @ c3ebd786
...@@ -4012,7 +4012,7 @@ bool mysql_show_binlog_events(THD* thd) ...@@ -4012,7 +4012,7 @@ bool mysql_show_binlog_events(THD* thd)
opt_master_verify_checksum)); ) opt_master_verify_checksum)); )
{ {
if (event_count >= limit_start && if (event_count >= limit_start &&
ev->net_send(thd, protocol, linfo.log_file_name, pos)) ev->net_send(protocol, linfo.log_file_name, pos))
{ {
errmsg = "Net error"; errmsg = "Net error";
delete ev; delete ev;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7