Below is the list of changes that have just been committed into a local
5.1 repository of rafal. When rafal does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-03-27 20:06:22+02:00, rafal@quant.(none) +7 -0
Merge quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl
into quant.(none):/ext/mysql/bk/mysql-5.1-bug21842
MERGE: 1.2343.55.2
sql/log_event.cc@stripped, 2007-03-27 20:05:15+02:00, rafal@quant.(none) +189 -406
Manual merge.
MERGE: 1.259.1.1
sql/log_event.h@stripped, 2007-03-27 20:05:33+02:00, rafal@quant.(none) +51 -67
Manual merge.
MERGE: 1.136.5.1
sql/partition_element.h@stripped, 2007-03-27 20:04:00+02:00, rafal@quant.(none) +0 -0
Auto merged
MERGE: 1.10.1.1
sql/rpl_utility.cc@stripped, 2007-03-27 20:04:01+02:00, rafal@quant.(none) +0 -0
Auto merged
MERGE: 1.3.2.1
sql/rpl_utility.h@stripped, 2007-03-27 20:05:45+02:00, rafal@quant.(none) +0 -1
Manual merge.
MERGE: 1.2.2.1
sql/slave.cc@stripped, 2007-03-27 20:05:55+02:00, rafal@quant.(none) +260 -381
Manual merge.
MERGE: 1.293.4.2
sql/slave.h@stripped, 2007-03-27 20:04:01+02:00, rafal@quant.(none) +0 -0
Auto merged
MERGE: 1.102.2.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: rafal
# Host: quant.(none)
# Root: /ext/mysql/bk/mysql-5.1-bug21842/RESYNC
--- 1.5/sql/rpl_utility.cc 2007-03-27 20:06:37 +02:00
+++ 1.6/sql/rpl_utility.cc 2007-03-27 20:06:37 +02:00
@@ -129,7 +129,7 @@
DBUG_ASSERT(tsh->db.str && tsh->table_name.str);
error= 1;
slave_print_msg(ERROR_LEVEL, rli, ER_BINLOG_ROW_WRONG_TABLE_DEF,
- "Table width mismatch - "
+ "table_def::compatible_with: Table width mismatch - "
"received %u columns, %s.%s has %u columns",
(uint) size(), tsh->db.str, tsh->table_name.str,
tsh->fields);
@@ -143,7 +143,7 @@
DBUG_ASSERT(tsh->db.str && tsh->table_name.str);
error= 1;
slave_print_msg(ERROR_LEVEL, rli, ER_BINLOG_ROW_WRONG_TABLE_DEF,
- "Column %d type mismatch - "
+ "table_def::compatible_with: Column %d type mismatch - "
"received type %d, %s.%s has type %d",
col, type(col), tsh->db.str, tsh->table_name.str,
table->field[col]->type());
--- 1.12/sql/partition_element.h 2007-03-27 20:06:37 +02:00
+++ 1.13/sql/partition_element.h 2007-03-27 20:06:37 +02:00
@@ -84,9 +84,10 @@
partition_element(partition_element *part_elem)
: part_max_rows(part_elem->part_max_rows),
part_min_rows(part_elem->part_min_rows),
+ range_value(0),
partition_name(NULL),
tablespace_name(part_elem->tablespace_name),
- range_value(0), part_comment(part_elem->part_comment),
+ part_comment(part_elem->part_comment),
data_file_name(part_elem->data_file_name),
index_file_name(part_elem->index_file_name),
engine_type(part_elem->engine_type),
--- 1.104/sql/slave.h 2007-03-27 20:06:37 +02:00
+++ 1.105/sql/slave.h 2007-03-27 20:06:37 +02:00
@@ -115,6 +115,13 @@
"FIRST")
#define IO_RPL_LOG_NAME (mi->master_log_name[0] ? mi->master_log_name :\
"FIRST")
+#define RPL_SAFE_LOG_NAME(N) ((N)[0] ? (N) : "FIRST")
+#define RPL_EVENT_LOG_NAME RPL_SAFE_LOG_NAME(rli->event_relay_log_name)
+#define RPL_GROUP_LOG_NAME RPL_SAFE_LOG_NAME(rli->group_relay_log_name)
+#define RPL_MASTER_LOG_NAME RPL_SAFE_LOG_NAME(rli->group_master_log_name)
+#define RPL_EVENT_POS(BUF) llstr(rli->event_relay_log_pos,(BUF))
+#define RPL_GROUP_POS(BUF) llstr(rli->group_relay_log_pos,(BUF))
+#define RPL_MASTER_GROUP_POS(BUF) llstr(rli->group_master_log_pos,(BUF))
/*
If the following is set, if first gives an error, second will be
| Thread |
|---|
| • bk commit into 5.1 tree (rafal:1.2485) | rsomla | 27 Mar |
