summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorunknown <cbell/Chuck@suse.vabb.com>2007-01-10 13:45:41 -0500
committerunknown <cbell/Chuck@suse.vabb.com>2007-01-10 13:45:41 -0500
commit1f58d47fb4c9a89b040d4315cfdaa888b2c517d3 (patch)
treeb6258cad704073eb9ed7afbf1a7b07a36bad31fc /sql/log_event.h
parent26ecdbd0248b8c6605e3d3baa58047f090d063ac (diff)
downloadmariadb-git-1f58d47fb4c9a89b040d4315cfdaa888b2c517d3.tar.gz
BUG#22645 - LC_TIME_NAMES: Statement not replicated
This patch is an additional code change to the get_str_len_and_pointer method in log_events.cc. This change is necessary to correct a problem encountered on 64-bit SUSE where the auto_increment_* variables were being overwritten. The change corrects a cast mismatch which caused the problem. sql/log_event.cc: BUG#22645 - LC_TIME_NAMES: Statement not replicated This patch is an additional code change to the get_str_len_and_pointer, copy_str_and_move methods and the Query_leg_event constructor to correct a type mismatch encountered during testing on SUSE 64-bit. The patch changes the data type of the buffer variables was changed to a new typedef defined in the Log_event class. The new type is: typedef unsigned char Byte; The variables changed include: pos, start, end, and data_buf sql/log_event.h: BUG#22645 - LC_TIME_NAMES: Statement not replicated This patch adds a new type definition to the Log_event class. The new type is typedef unsigned char Byte. It is used in place of the uchar and usigned char definitions in the Query_log_event constructor to eliminate type conversion problems encountere on SUSE 64-bit.
Diffstat (limited to 'sql/log_event.h')
-rw-r--r--sql/log_event.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index a44e3476c41..9c2e7c5f7ea 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -547,6 +547,13 @@ class Log_event
{
public:
/*
+ The following type definition is to be used whenever data is placed
+ and manipulated in a common buffer. Use this typedef for buffers
+ that contain data containing binary and character data.
+ */
+ typedef unsigned char Byte;
+
+ /*
The offset in the log where this event originally appeared (it is
preserved in relay logs, making SHOW SLAVE STATUS able to print
coordinates of the event in the master's binlog). Note: when a
@@ -719,7 +726,7 @@ public:
class Query_log_event: public Log_event
{
protected:
- char* data_buf;
+ Log_event::Byte* data_buf;
public:
const char* query;
const char* catalog;