Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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, 2006-08-22 10:36:11+02:00, mats@romeo.(none) +4 -0
WL#3259 (RBR with more columns on slave than on master):
Post-merge fixes.
mysql-test/r/rpl_row_tabledefs_3innodb.result@stripped, 2006-08-22 10:36:04+02:00, mats@romeo.(none) +4 -4
Result change
mysql-test/t/disabled.def@stripped, 2006-08-22 10:36:04+02:00, mats@romeo.(none) +1 -0
Disabling test that appear to be fixed in other clones
sql/field.cc@stripped, 2006-08-22 10:36:04+02:00, mats@romeo.(none) +1 -0
Post-merge fix
sql/log_event.cc@stripped, 2006-08-22 10:36:04+02:00, mats@romeo.(none) +54 -53
Changes to unpack_row():
- Documentation
- New parameter, the write/read set
- R/W set now 0-indexed instead of 1-indexed
- Removed column value printing
Changes to replace_record():
- Documentation
- Removed column value printing
Removed unused function print_column_values()
# 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: mats
# Host: romeo.(none)
# Root: /home/bk/w3259-mysql-5.1-new-rpl
--- 1.328/sql/field.cc 2006-08-22 10:36:20 +02:00
+++ 1.329/sql/field.cc 2006-08-22 10:36:20 +02:00
@@ -1255,6 +1255,7 @@
CHARSET_INFO *cs= charset();
cs->coll->hash_sort(cs, (uchar*) ptr, len, nr, nr2);
}
+}
my_size_t
Field::do_last_null_byte() const
--- 1.238/sql/log_event.cc 2006-08-22 10:36:20 +02:00
+++ 1.239/sql/log_event.cc 2006-08-22 10:36:20 +02:00
@@ -5293,21 +5293,39 @@
/*
Unpack a row into a record.
- The row is assumed to only consist of the fields for which the
- bitset represented by 'arr' and 'bits'; the other parts of the
- record are left alone.
+ SYNOPSIS
+ unpack_row()
+ rli Relay log info
+ table Table to unpack into
+ colcnt Number of columns to read from record
+ record Record where the data should be unpacked
+ row Packed row data
+ cols Pointer to columns data to fill in
+ row_end Pointer to variable that will hold the value of the
+ one-after-end position for the row
+ master_reclength
+ Pointer to variable that will hold the length of the
+ record on the master side
+ rw_set Pointer to bitmap that holds either the read_set or the
+ write_set of the table
+
+ DESCRIPTION
+
+ The row is assumed to only consist of the fields for which the
+ bitset represented by 'arr' and 'bits'; the other parts of the
+ record are left alone.
- At most 'colcnt' columns are read: if the table is larger than that,
- the remaining fields are not filled in.
+ At most 'colcnt' columns are read: if the table is larger than
+ that, the remaining fields are not filled in.
*/
static int
unpack_row(RELAY_LOG_INFO *rli,
TABLE *table, uint const colcnt, byte *record,
char const *row, MY_BITMAP const *cols,
- char const **row_end, ulong *master_reclength)
+ char const **row_end, ulong *master_reclength,
+ MY_BITMAP* const rw_set)
{
DBUG_ASSERT(record && row);
- MY_BITMAP *write_set= table->write_set;
my_ptrdiff_t const offset= record - (byte*) table->record[0];
my_size_t master_null_bytes= table->s->null_bytes;
@@ -5326,7 +5344,7 @@
memcpy(record, row, master_null_bytes); // [1]
int error= 0;
- bitmap_set_all(write_set);
+ bitmap_set_all(rw_set);
Field **const begin_ptr = table->field;
Field **field_ptr;
@@ -5339,11 +5357,12 @@
if (bitmap_is_set(cols, field_ptr - begin_ptr))
{
- /* Field...::unpack() cannot return 0 */
ptr= f->unpack(f->ptr + offset, ptr);
+ /* Field...::unpack() cannot return 0 */
+ DBUG_ASSERT(ptr != NULL);
}
else
- bitmap_clear_bit(write_set, (field_ptr - begin_ptr) + 1);
+ bitmap_clear_bit(rw_set, field_ptr - begin_ptr);
}
*row_end = ptr;
@@ -6102,27 +6121,6 @@
}
#endif
-#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-#ifndef DBUG_OFF
-static void
-print_column_values(char const *text, THD *thd, TABLE *table)
-{
- THD *old_thd= table->in_use;
- if (table->in_use == NULL)
- table->in_use= thd;
- for (Field **fptr= table->field ; *fptr ; ++fptr)
- {
- char buf[MAX_FIELD_WIDTH];
- String str(buf, sizeof(buf), system_charset_info);
- (*fptr)->val_str(&str);
- DBUG_PRINT("info", ("%s for column %d is '%s'",
- text, fptr - table->field, str.c_ptr()));
- }
- table->in_use= old_thd;
-}
-#endif
-#endif
-
/**************************************************************************
Write_rows_log_event member functions
**************************************************************************/
@@ -6219,10 +6217,9 @@
int error;
error= unpack_row(rli,
table, m_width, table->record[0],
- row_start, &m_cols, row_end, &m_master_reclength);
-#ifndef DBUG_OFF
- print_column_values("Unpacked value", thd, table);
-#endif
+ row_start, &m_cols, row_end, &m_master_reclength,
+ table->write_set);
+ bitmap_copy(table->read_set, table->write_set);
return error;
}
@@ -6345,17 +6342,22 @@
/*
Replace the provided record in the database.
- Similar to how it is done in <code>mysql_insert()</code>, we first
- try to do a <code>ha_write_row()</code> and of that fails due to
- duplicated keys (or indices), we do an <code>ha_update_row()</code>
- or a <code>ha_delete_row()</code> instead.
-
- @param thd Thread context for writing the record.
- @param table Table to which record should be written.
- @param master_reclength
- Offset to first column that is not present on the master,
- alternatively the length of the record on the master side.
- @return Error code on failure, 0 on success.
+ SYNOPSIS
+ replace_record()
+ thd Thread context for writing the record.
+ table Table to which record should be written.
+ master_reclength
+ Offset to first column that is not present on the master,
+ alternatively the length of the record on the master
+ side.
+
+ RETURN VALUE
+ Error code on failure, 0 on success.
+
+ DESCRIPTION
+ Similar to how it is done in mysql_insert(), we first try to do
+ a ha_write_row() and of that fails due to duplicated keys (or
+ indices), we do an ha_update_row() or a ha_delete_row() instead.
*/
static int
replace_record(THD *thd, TABLE *table,
@@ -6369,10 +6371,6 @@
int keynum;
auto_afree_ptr<char> key(NULL);
-#ifndef DBUG_OFF
- print_column_values("Starting write value", thd, table);
-#endif
-
while ((error= table->file->ha_write_row(table->record[0])))
{
if ((keynum= table->file->get_dup_key(error)) < 0)
@@ -6766,7 +6764,8 @@
error= unpack_row(rli,
table, m_width, table->record[0],
- row_start, &m_cols, row_end, &m_master_reclength);
+ row_start, &m_cols, row_end, &m_master_reclength,
+ table->read_set);
/*
If we will access rows using the random access method, m_key will
be set to NULL, so we do not need to make a key copy in that case.
@@ -6908,12 +6907,14 @@
/* record[0] is the before image for the update */
error= unpack_row(rli,
table, m_width, table->record[0],
- row_start, &m_cols, row_end, &m_master_reclength);
+ row_start, &m_cols, row_end, &m_master_reclength,
+ table->read_set);
row_start = *row_end;
/* m_after_image is the after image for the update */
error= unpack_row(rli,
table, m_width, m_after_image,
- row_start, &m_cols, row_end, &m_master_reclength);
+ row_start, &m_cols, row_end, &m_master_reclength,
+ table->write_set);
/*
If we will access rows using the random access method, m_key will
--- 1.183/mysql-test/t/disabled.def 2006-08-22 10:36:20 +02:00
+++ 1.184/mysql-test/t/disabled.def 2006-08-22 10:36:20 +02:00
@@ -36,6 +36,7 @@
rpl_row_func003 : BUG#19074 2006-13-04 andrei test failed
rpl_row_inexist_tbl : BUG#18948 2006-03-09 mats Disabled since patch makes this test wait forever
rpl_sp : BUG#16456 2006-02-16 jmiller
+rpl_sp_effects : BUG#19862 2006-08-22 mats Bug appear to be fixed
rpl_until : BUG#15886 2006-02-16 jmiller Unstable test case
sp-goto : BUG#18949 2006-02-16 jmiller GOTO is currently is disabled - will be fixed in the future
mysqldump : BUG#18078 2006-03-10 lars
--- 1.1/mysql-test/r/rpl_row_tabledefs_3innodb.result 2006-08-22 10:36:20 +02:00
+++ 1.2/mysql-test/r/rpl_row_tabledefs_3innodb.result 2006-08-22 10:36:20 +02:00
@@ -151,7 +151,7 @@
Replicate_Ignore_Table
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
-Last_Errno 1514
+Last_Errno 1522
Last_Error Table width mismatch - received 2 columns, test.t2 has 1 columns
Skip_Counter 0
Exec_Master_Log_Pos #
@@ -189,7 +189,7 @@
Replicate_Ignore_Table
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
-Last_Errno 1514
+Last_Errno 1522
Last_Error Column 0 type mismatch - received type 3, test.t4 has type 4
Skip_Counter 0
Exec_Master_Log_Pos #
@@ -227,7 +227,7 @@
Replicate_Ignore_Table
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
-Last_Errno 1514
+Last_Errno 1522
Last_Error Column 1 type mismatch - received type 3, test.t5 has type 4
Skip_Counter 0
Exec_Master_Log_Pos #
@@ -265,7 +265,7 @@
Replicate_Ignore_Table
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
-Last_Errno 1514
+Last_Errno 1522
Last_Error Column 2 type mismatch - received type 3, test.t6 has type 4
Skip_Counter 0
Exec_Master_Log_Pos #
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.2252) | Mats Kindahl | 22 Aug |
