Post-merge changes. (219a7505) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqlbinlog.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -270,7 +270,7 @@ class Load_log_processor
		File prepare_new_file_for_old_format(Load_log_event le, char filename);
		int load_old_format_file(NET* net, const char *server_fname,
		uint server_fname_len, File file);
		int process_first_event(const char bname, uint blen, const char block,
		int process_first_event(const char bname, uint blen, const uchar block,
		uint block_len, uint file_id,
		Create_file_log_event *ce);
		};
		@@ -375,7 +375,7 @@ int Load_log_processor::load_old_format_file(NET* net, const char*server_fname,
		*/

		int Load_log_processor::process_first_event(const char *bname, uint blen,
		const char *block, uint block_len,
		const uchar *block, uint block_len,
		uint file_id,
		Create_file_log_event *ce)
		{

sql-common/client.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2095,7 +2095,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL mysql,const char host, const char *user,
		/* Check if version of protocol matches current one */

		mysql->protocol_version= net->read_pos[0];
		DBUG_DUMP("packet",(char*) net->read_pos,10);
		DBUG_DUMP("packet",(uchar*) net->read_pos,10);
		DBUG_PRINT("info",("mysql protocol version %d, server=%d",
		PROTOCOL_VERSION, mysql->protocol_version));
		if (mysql->protocol_version != PROTOCOL_VERSION)
		@@ -2221,7 +2221,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL mysql,const char host, const char *user,
		Send client_flag, max_packet_size - unencrypted otherwise
		the server does not know we want to do SSL
		*/
		if (my_net_write(net,buff,(uint) (end-buff)) \|\| net_flush(net))
		if (my_net_write(net, (uchar*) buff, (uint) (end-buff)) \|\| net_flush(net))
		{
		set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
		ER(CR_SERVER_LOST_EXTENDED),

sql/item_cmpfunc.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -947,7 +947,7 @@ get_datetime_value(THD thd, Item item_arg, Item cache_arg,
		*is_null= item->null_value;
		}
		if (*is_null)
		return -1;
		return ~(ulonglong) -1;
		/*
		Convert strings to the integer DATE/DATETIME representation.
		Even if both dates provided in strings we can't compare them directly as

sql/log_event.cc

+5 −5

Original line number	Diff line number	Diff line
		@@ -5064,7 +5064,7 @@ Create_file_log_event(THD* thd_arg, sql_exchange* ex,
		const char* db_arg, const char* table_name_arg,
		List<Item>& fields_arg, enum enum_duplicates handle_dup,
		bool ignore,
		char* block_arg, uint block_len_arg, bool using_trans)
		uchar* block_arg, uint block_len_arg, bool using_trans)
		:Load_log_event(thd_arg,ex,db_arg,table_name_arg,fields_arg,handle_dup, ignore,
		using_trans),
		fake_base(0), block(block_arg), event_buf(0), block_len(block_len_arg),
		@@ -5163,7 +5163,7 @@ Create_file_log_event::Create_file_log_event(const char* buf, uint len,
		create_file_header_len + 1);
		if (len < block_offset)
		DBUG_VOID_RETURN;
		block = (char*)buf + block_offset;
		block = (uchar*)buf + block_offset;
		block_len = len - block_offset;
		}
		else
		@@ -5321,7 +5321,7 @@ int Create_file_log_event::do_apply_event(Relay_log_info const *rli)
		#ifndef MYSQL_CLIENT
		Append_block_log_event::Append_block_log_event(THD *thd_arg,
		const char *db_arg,
		char *block_arg,
		uchar *block_arg,
		uint block_len_arg,
		bool using_trans)
		:Log_event(thd_arg,0, using_trans), block(block_arg),
		@@ -5347,7 +5347,7 @@ Append_block_log_event::Append_block_log_event(const char* buf, uint len,
		if (len < total_header_len)
		DBUG_VOID_RETURN;
		file_id= uint4korr(buf + common_header_len + AB_FILE_ID_OFFSET);
		block= (char*)buf + total_header_len;
		block= (uchar*)buf + total_header_len;
		block_len= len - total_header_len;
		DBUG_VOID_RETURN;
		}
		@@ -5739,7 +5739,7 @@ int Execute_load_log_event::do_apply_event(Relay_log_info const *rli)

		#ifndef MYSQL_CLIENT
		Begin_load_query_log_event::
		Begin_load_query_log_event(THD* thd_arg, const char* db_arg, char* block_arg,
		Begin_load_query_log_event(THD* thd_arg, const char* db_arg, uchar* block_arg,
		uint block_len_arg, bool using_trans)
		:Append_block_log_event(thd_arg, db_arg, block_arg, block_len_arg,
		using_trans)

sql/log_event.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -2519,7 +2519,7 @@ class Create_file_log_event: public Load_log_event
		*/
		bool fake_base;
		public:
		char* block;
		uchar* block;
		const char *event_buf;
		uint block_len;
		uint file_id;
		@@ -2530,7 +2530,7 @@ class Create_file_log_event: public Load_log_event
		const char* table_name_arg,
		List<Item>& fields_arg,
		enum enum_duplicates handle_dup, bool ignore,
		char* block_arg, uint block_len_arg,
		uchar* block_arg, uint block_len_arg,
		bool using_trans);
		#ifdef HAVE_REPLICATION
		void pack_info(Protocol* protocol);
		@@ -2585,7 +2585,7 @@ class Create_file_log_event: public Load_log_event
		class Append_block_log_event: public Log_event
		{
		public:
		char* block;
		uchar* block;
		uint block_len;
		uint file_id;
		/*
		@@ -2602,7 +2602,7 @@ class Append_block_log_event: public Log_event
		const char* db;

		#ifndef MYSQL_CLIENT
		Append_block_log_event(THD* thd, const char* db_arg, char* block_arg,
		Append_block_log_event(THD* thd, const char* db_arg, uchar* block_arg,
		uint block_len_arg, bool using_trans);
		#ifdef HAVE_REPLICATION
		void pack_info(Protocol* protocol);
		@@ -2726,7 +2726,7 @@ class Begin_load_query_log_event: public Append_block_log_event
		public:
		#ifndef MYSQL_CLIENT
		Begin_load_query_log_event(THD* thd_arg, const char *db_arg,
		char* block_arg, uint block_len_arg,
		uchar* block_arg, uint block_len_arg,
		bool using_trans);
		#ifdef HAVE_REPLICATION
		Begin_load_query_log_event(THD* thd);