diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:14:14 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:14:14 +0100 |
| commit | b395490480dcf636a09a45f36733c32ec14b1772 (patch) | |
| tree | c9b1db7cfc763396ac45fed931a526ddf538698a /sql/log_event.cc | |
| parent | 401628a18eebedaf7bdf95b0a25c09398e4c19d9 (diff) | |
| parent | 101c30ccc48d38c3ea98ebd89a350120a45aa591 (diff) | |
| download | mariadb-git-b395490480dcf636a09a45f36733c32ec14b1772.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
BitKeeper/deleted/.del-show_binlog_events2.inc:
Auto merged
sql-common/client.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 46ac5e6f571..f31a7452e56 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -5069,7 +5069,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), @@ -5168,7 +5168,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 @@ -5326,7 +5326,7 @@ err: #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), @@ -5352,7 +5352,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; } @@ -5744,7 +5744,7 @@ err: #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) |