Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
Browse Source

Post-merge changes. 

BitKeeper/deleted/.del-show_binlog_events2.inc:
  Delete: mysql-test/include/show_binlog_events2.inc
client/mysqlbinlog.cc:
  char -> uchar for raw memory.
sql/item_cmpfunc.cc:
  Adding cast to remove warning when converting negative integer
  to unsigned type.
sql/log_event.cc:
  char -> uchar for raw memory.
sql/log_event.h:
  char -> uchar for raw memory.
sql/rpl_utility.cc:
  Adding cast to remove warning when converting negative integer
  to unsigned type.
sql/slave.cc:
  char -> uchar for raw memory.
sql/sql_repl.cc:
  char -> uchar for raw memory.
sql-common/client.c:
  char -> uchar for raw memory.
pull/374/head
unknown 18 years ago
parent
817bfa350c
commit
101c30ccc4
8 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      client/mysqlbinlog.cc
  2. 4
      sql-common/client.c
  3. 2
      sql/item_cmpfunc.cc
  4. 10
      sql/log_event.cc
  5. 10
      sql/log_event.h
  6. 2
      sql/rpl_utility.cc
  7. 4
      sql/slave.cc
  8. 2
      sql/sql_repl.cc

4
client/mysqlbinlog.cc
View File

@ -270,7 +270,7 @@ public:
File prepare_new_file_for_old_format(Load_log_event *le, char *filename); File prepare_new_file_for_old_format(Load_log_event *le, char *filename);
int load_old_format_file(NET* net, const char *server_fname, int load_old_format_file(NET* net, const char *server_fname,
uint server_fname_len, File file); 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, uint block_len, uint file_id,
Create_file_log_event *ce); 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, 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, uint file_id,
Create_file_log_event *ce) Create_file_log_event *ce)
{ {

4
sql-common/client.c
View File

@ -2095,7 +2095,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
/* Check if version of protocol matches current one */ /* Check if version of protocol matches current one */
mysql->protocol_version= net->read_pos[0]; 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", DBUG_PRINT("info",("mysql protocol version %d, server=%d",
PROTOCOL_VERSION, mysql->protocol_version)); PROTOCOL_VERSION, mysql->protocol_version));
if (mysql->protocol_version != 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 Send client_flag, max_packet_size - unencrypted otherwise
the server does not know we want to do SSL 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, set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
ER(CR_SERVER_LOST_EXTENDED), ER(CR_SERVER_LOST_EXTENDED),

2
sql/item_cmpfunc.cc
View File

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

10
sql/log_event.cc
View File

@ -5064,7 +5064,7 @@ Create_file_log_event(THD* thd_arg, sql_exchange* ex,
const char* db_arg, const char* table_name_arg, const char* db_arg, const char* table_name_arg,
List<Item>& fields_arg, enum enum_duplicates handle_dup, List<Item>& fields_arg, enum enum_duplicates handle_dup,
bool ignore, 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, :Load_log_event(thd_arg,ex,db_arg,table_name_arg,fields_arg,handle_dup, ignore,
using_trans), using_trans),
fake_base(0), block(block_arg), event_buf(0), block_len(block_len_arg), 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); create_file_header_len + 1);
if (len < block_offset) if (len < block_offset)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
block = (char*)buf + block_offset;
block = (uchar*)buf + block_offset;
block_len = len - block_offset; block_len = len - block_offset;
} }
else else
@ -5321,7 +5321,7 @@ err:
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT
Append_block_log_event::Append_block_log_event(THD *thd_arg, Append_block_log_event::Append_block_log_event(THD *thd_arg,
const char *db_arg, const char *db_arg,
char *block_arg,
uchar *block_arg,
uint block_len_arg, uint block_len_arg,
bool using_trans) bool using_trans)
:Log_event(thd_arg,0, using_trans), block(block_arg), :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) if (len < total_header_len)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
file_id= uint4korr(buf + common_header_len + AB_FILE_ID_OFFSET); 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; block_len= len - total_header_len;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@ -5739,7 +5739,7 @@ err:
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT
Begin_load_query_log_event:: 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) uint block_len_arg, bool using_trans)
:Append_block_log_event(thd_arg, db_arg, block_arg, block_len_arg, :Append_block_log_event(thd_arg, db_arg, block_arg, block_len_arg,
using_trans) using_trans)

10
sql/log_event.h
View File

@ -2519,7 +2519,7 @@ protected:
*/ */
bool fake_base; bool fake_base;
public: public:
char* block;
uchar* block;
const char *event_buf; const char *event_buf;
uint block_len; uint block_len;
uint file_id; uint file_id;
@ -2530,7 +2530,7 @@ public:
const char* table_name_arg, const char* table_name_arg,
List<Item>& fields_arg, List<Item>& fields_arg,
enum enum_duplicates handle_dup, bool ignore, enum enum_duplicates handle_dup, bool ignore,
char* 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(Protocol* protocol); void pack_info(Protocol* protocol);
@ -2585,7 +2585,7 @@ private:
class Append_block_log_event: public Log_event class Append_block_log_event: public Log_event
{ {
public: public:
char* block;
uchar* block;
uint block_len; uint block_len;
uint file_id; uint file_id;
/* /*
@ -2602,7 +2602,7 @@ public:
const char* db; const char* db;
#ifndef MYSQL_CLIENT #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); uint block_len_arg, bool using_trans);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
void pack_info(Protocol* protocol); void pack_info(Protocol* protocol);
@ -2726,7 +2726,7 @@ class Begin_load_query_log_event: public Append_block_log_event
public: public:
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT
Begin_load_query_log_event(THD* thd_arg, const char *db_arg, 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); bool using_trans);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
Begin_load_query_log_event(THD* thd); Begin_load_query_log_event(THD* thd);

2
sql/rpl_utility.cc
View File

@ -164,7 +164,7 @@ uint32 table_def::calc_field_size(uint col, uchar *master_data) const
break; break;
} }
default: default:
length= -1;
length= ~(uint32) -1;
} }
return length; return length;
} }

4
sql/slave.cc
View File

@ -2823,7 +2823,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev)
} }
if (unlikely(cev_not_written)) if (unlikely(cev_not_written))
{ {
cev->block = (char*)net->read_pos;
cev->block = net->read_pos;
cev->block_len = num_bytes; cev->block_len = num_bytes;
if (unlikely(mi->rli.relay_log.append(cev))) if (unlikely(mi->rli.relay_log.append(cev)))
{ {
@ -2837,7 +2837,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev)
} }
else else
{ {
aev.block = (char*)net->read_pos;
aev.block = net->read_pos;
aev.block_len = num_bytes; aev.block_len = num_bytes;
aev.log_pos = cev->log_pos; aev.log_pos = cev->log_pos;
if (unlikely(mi->rli.relay_log.append(&aev))) if (unlikely(mi->rli.relay_log.append(&aev)))

2
sql/sql_repl.cc
View File

@ -1595,7 +1595,7 @@ int log_loaded_block(IO_CACHE* file)
LOAD_FILE_INFO *lf_info; LOAD_FILE_INFO *lf_info;
uint block_len; uint block_len;
/* buffer contains position where we started last read */ /* buffer contains position where we started last read */
char* buffer= my_b_get_buffer_start(file);
uchar* buffer= my_b_get_buffer_start(file);
uint max_event_size= current_thd->variables.max_allowed_packet; uint max_event_size= current_thd->variables.max_allowed_packet;
lf_info= (LOAD_FILE_INFO*) file->arg; lf_info= (LOAD_FILE_INFO*) file->arg;
if (lf_info->thd->current_stmt_binlog_row_based) if (lf_info->thd->current_stmt_binlog_row_based)

Write Preview
Loading…
Cancel
Save