summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-test/suite/binlog/r/binlog_old_versions.result10
-rw-r--r--mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001bin0 -> 149436 bytes
-rw-r--r--mysql-test/suite/binlog/t/binlog_old_versions.test15
-rw-r--r--sql/log_event.cc24
-rw-r--r--sql/log_event.h12
-rw-r--r--sql/sql_binlog.cc7
6 files changed, 46 insertions, 22 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_old_versions.result b/mysql-test/suite/binlog/r/binlog_old_versions.result
index a514f9278a6..77289252b4c 100644
--- a/mysql-test/suite/binlog/r/binlog_old_versions.result
+++ b/mysql-test/suite/binlog/r/binlog_old_versions.result
@@ -29,6 +29,16 @@ SELECT COUNT(*) FROM t3;
COUNT(*)
17920
DROP TABLE t1, t2, t3;
+==== Read binlog from version 4.1 ====
+SELECT * FROM t1 ORDER BY a;
+a b
+0 last_insert_id
+4 four
+190243 random
+SELECT COUNT(*) FROM t3;
+COUNT(*)
+17920
+DROP TABLE t1, t3;
==== Read binlog from alcatel tree (mysql-5.1-wl2325-5.0-drop6) ====
SELECT * FROM t1 ORDER BY a;
a b
diff --git a/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001 b/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001
new file mode 100644
index 00000000000..66db9668d46
--- /dev/null
+++ b/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001
Binary files differ
diff --git a/mysql-test/suite/binlog/t/binlog_old_versions.test b/mysql-test/suite/binlog/t/binlog_old_versions.test
index 9fb7343e761..b2922809b1b 100644
--- a/mysql-test/suite/binlog/t/binlog_old_versions.test
+++ b/mysql-test/suite/binlog/t/binlog_old_versions.test
@@ -51,6 +51,21 @@ SELECT COUNT(*) FROM t3;
DROP TABLE t1, t2, t3;
+--echo ==== Read binlog from version 4.1 ====
+
+# In this version, neither row-based binlogging nor Xid events
+# existed, so the binlog was generated without the "row-based tests"
+# part and the "get xid event" part, and it does not create table t2.
+
+# Read binlog.
+--exec $MYSQL_BINLOG suite/binlog/std_data/binlog_old_version_4_1.000001 | $MYSQL
+# Show result.
+SELECT * FROM t1 ORDER BY a;
+SELECT COUNT(*) FROM t3;
+# Reset.
+DROP TABLE t1, t3;
+
+
--echo ==== Read binlog from alcatel tree (mysql-5.1-wl2325-5.0-drop6) ====
# In this version, it was not possible to switch between row-based and
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 45478020a36..070e6ab4c12 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -212,9 +212,9 @@ uint debug_not_change_ts_if_art_event= 1; // bug#29309 simulation
*/
#ifdef MYSQL_CLIENT
-static void pretty_print_str(IO_CACHE* cache, char* str, int len)
+static void pretty_print_str(IO_CACHE* cache, const char* str, int len)
{
- char* end = str + len;
+ const char* end = str + len;
my_b_printf(cache, "\'");
while (str < end)
{
@@ -277,9 +277,9 @@ inline int ignored_error_code(int err_code)
*/
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-static char *pretty_print_str(char *packet, char *str, int len)
+static char *pretty_print_str(char *packet, const char *str, int len)
{
- char *end= str + len;
+ const char *end= str + len;
char *pos= packet;
*pos++= '\'';
while (str < end)
@@ -388,7 +388,7 @@ static void cleanup_load_tmpdir()
write_str()
*/
-static bool write_str(IO_CACHE *file, char *str, uint length)
+static bool write_str(IO_CACHE *file, const char *str, uint length)
{
uchar tmp[1];
tmp[0]= (uchar) length;
@@ -6011,7 +6011,8 @@ bool sql_ex_info::write_data(IO_CACHE* file)
sql_ex_info::init()
*/
-char *sql_ex_info::init(char *buf, char *buf_end, bool use_new_format)
+const char *sql_ex_info::init(const char *buf, const char *buf_end,
+ bool use_new_format)
{
cached_new_format = use_new_format;
if (use_new_format)
@@ -6024,12 +6025,11 @@ char *sql_ex_info::init(char *buf, char *buf_end, bool use_new_format)
the case when we have old format because we will be reusing net buffer
to read the actual file before we write out the Create_file event.
*/
- const char *ptr= buf;
- if (read_str(&ptr, buf_end, (const char **) &field_term, &field_term_len) ||
- read_str(&ptr, buf_end, (const char **) &enclosed, &enclosed_len) ||
- read_str(&ptr, buf_end, (const char **) &line_term, &line_term_len) ||
- read_str(&ptr, buf_end, (const char **) &line_start, &line_start_len) ||
- read_str(&ptr, buf_end, (const char **) &escaped, &escaped_len))
+ if (read_str(&buf, buf_end, &field_term, &field_term_len) ||
+ read_str(&buf, buf_end, &enclosed, &enclosed_len) ||
+ read_str(&buf, buf_end, &line_term, &line_term_len) ||
+ read_str(&buf, buf_end, &line_start, &line_start_len) ||
+ read_str(&buf, buf_end, &escaped, &escaped_len))
return 0;
opt_flags = *buf++;
}
diff --git a/sql/log_event.h b/sql/log_event.h
index 31c1ab7173a..c85d620d831 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -152,11 +152,11 @@ struct old_sql_ex
struct sql_ex_info
{
sql_ex_info() {} /* Remove gcc warning */
- char* field_term;
- char* enclosed;
- char* line_term;
- char* line_start;
- char* escaped;
+ const char* field_term;
+ const char* enclosed;
+ const char* line_term;
+ const char* line_start;
+ const char* escaped;
int cached_new_format;
uint8 field_term_len,enclosed_len,line_term_len,line_start_len, escaped_len;
char opt_flags;
@@ -171,7 +171,7 @@ struct sql_ex_info
line_start_len + escaped_len + 6 : 7);
}
bool write_data(IO_CACHE* file);
- char* init(char* buf,char* buf_end,bool use_new_format);
+ const char* init(const char* buf, const char* buf_end, bool use_new_format);
bool new_format()
{
return ((cached_new_format != -1) ? cached_new_format :
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index 543b1af9fc0..778aa46149c 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -159,14 +159,13 @@ void mysql_client_binlog_statement(THD* thd)
*/
if (!have_fd_event)
{
- if (bufptr[EVENT_TYPE_OFFSET] == FORMAT_DESCRIPTION_EVENT)
+ int type = bufptr[EVENT_TYPE_OFFSET];
+ if (type == FORMAT_DESCRIPTION_EVENT || type == START_EVENT_V3)
have_fd_event= TRUE;
else
{
my_error(ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT,
- MYF(0),
- Log_event::get_type_str(
- (Log_event_type)bufptr[EVENT_TYPE_OFFSET]));
+ MYF(0), Log_event::get_type_str((Log_event_type)type));
goto end;
}
}
View Lorry Controller Status