diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:03:00 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:03:00 +0100 |
| commit | 101c30ccc48d38c3ea98ebd89a350120a45aa591 (patch) | |
| tree | 5718a5af3c09c59f20c1a2cca72da33e9c852e55 /sql/log_event.h | |
| parent | 817bfa350c6ea2464f1357969f17acd08b909e14 (diff) | |
| download | mariadb-git-101c30ccc48d38c3ea98ebd89a350120a45aa591.tar.gz | |
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.
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 31c1ab7173a..efb8675780e 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -2519,7 +2519,7 @@ protected: */ bool fake_base; public: - char* block; + uchar* block; const char *event_buf; uint block_len; uint file_id; @@ -2530,7 +2530,7 @@ public: 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 @@ private: class Append_block_log_event: public Log_event { public: - char* block; + uchar* block; uint block_len; uint file_id; /* @@ -2602,7 +2602,7 @@ public: 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); |