mariadb/sql/rpl_record_old.cc
unknown abbf5941d9 BUG#24954 (Last_errno and Last_error not set after master_retry_count has
been reached):

Post-merge patch to handle all the changes to the tree since the tree
was cloned.


mysql-test/extra/rpl_tests/rpl_log.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/extra/rpl_tests/rpl_reset_slave.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/include/show_slave_status.inc:
  Column change.
mysql-test/r/rpl_000015.result:
  Result file change.
mysql-test/r/rpl_change_master.result:
  Result file change.
mysql-test/r/rpl_empty_master_crash.result:
  Result file change.
mysql-test/r/rpl_extraCol_innodb.result:
  Result file change.
mysql-test/r/rpl_extraCol_myisam.result:
  Result file change.
mysql-test/r/rpl_flushlog_loop.result:
  Result file change.
mysql-test/r/rpl_incident.result:
  Result file change.
mysql-test/r/rpl_known_bugs_detection.result:
  Result file change.
mysql-test/r/rpl_loaddata.result:
  Result file change.
mysql-test/r/rpl_loaddata_fatal.result:
  Result file change.
mysql-test/r/rpl_log_pos.result:
  Result file change.
mysql-test/r/rpl_ndb_basic.result:
  Result file change.
mysql-test/r/rpl_ndb_circular.result:
  Result file change.
mysql-test/r/rpl_ndb_extraCol.result:
  Result file change.
mysql-test/r/rpl_ndb_idempotent.result:
  Result file change.
mysql-test/r/rpl_ndb_log.result:
  Result file change.
mysql-test/r/rpl_ndb_sync.result:
  Result file change.
mysql-test/r/rpl_rbr_to_sbr.result:
  Result file change.
mysql-test/r/rpl_redirect.result:
  Result file change.
mysql-test/r/rpl_replicate_do.result:
  Result file change.
mysql-test/r/rpl_rotate_logs.result:
  Result file change.
mysql-test/r/rpl_row_inexist_tbl.result:
  Result file change.
mysql-test/r/rpl_row_log.result:
  Result file change.
mysql-test/r/rpl_row_log_innodb.result:
  Result file change.
mysql-test/r/rpl_row_max_relay_size.result:
  Result file change.
mysql-test/r/rpl_row_reset_slave.result:
  Result file change.
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Result file change.
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Result file change.
mysql-test/r/rpl_row_until.result:
  Result file change.
mysql-test/r/rpl_server_id1.result:
  Result file change.
mysql-test/r/rpl_server_id2.result:
  Result file change.
mysql-test/r/rpl_slave_skip.result:
  Result file change.
mysql-test/r/rpl_ssl.result:
  Result file change.
mysql-test/r/rpl_ssl1.result:
  Result file change.
mysql-test/r/rpl_stm_log.result:
  Result file change.
mysql-test/r/rpl_stm_max_relay_size.result:
  Result file change.
mysql-test/r/rpl_stm_reset_slave.result:
  Result file change.
mysql-test/r/rpl_stm_until.result:
  Result file change.
mysql-test/t/rpl_000015.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/t/rpl_change_master.test:
  Column position change.
  Making result of SHOW SLAVE STATUS vertical.
mysql-test/t/rpl_empty_master_crash.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/t/rpl_log_pos.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/t/rpl_ndb_basic.test:
  Column position change.
mysql-test/t/rpl_ndb_idempotent.test:
  Column position change.
mysql-test/t/rpl_ndb_sync.test:
  Column position change.
  Making result of SHOW SLAVE STATUS vertical.
mysql-test/t/rpl_redirect.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/t/rpl_replicate_do.test:
  Column position change.
  Making result of SHOW SLAVE STATUS vertical.
mysql-test/t/rpl_rotate_logs.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/t/rpl_row_inexist_tbl.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/t/rpl_row_until.test:
  Replacing SHOW SLAVE STATUS with include file.
mysql-test/t/rpl_server_id1.test:
  Column position change.
  Making result of SHOW SLAVE STATUS vertical.
mysql-test/t/rpl_server_id2.test:
  Column position change.
  Making result of SHOW SLAVE STATUS vertical.
mysql-test/t/rpl_slave_status.test:
  Column position change.
mysql-test/t/rpl_ssl.test:
  Column position change.
mysql-test/t/rpl_ssl1.test:
  Column position change.
mysql-test/t/rpl_stm_until.test:
  Replacing SHOW SLAVE STATUS with include file.
sql/log_event.cc:
  Using member function last_error() instead of member variable.
  Replacing use of 'table' with 'm_table'.
  Suppressing warnings in debug printout.
  Setting thd->net.last_error on error return from unpack_row() to get
  a non-zero error message.  The error codes for are being harmonized
  in another worklog.
  Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
sql/rpl_mi.h:
  Moving order of include files since they are dependent (!).
sql/rpl_record.cc:
  Adding missing include file.
  Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
sql/rpl_record_old.cc:
  Adding missing include file.
  Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
sql/rpl_reporting.cc:
  Adding const modifier to member function.
  Using renamed member variable m_last_error.
sql/rpl_reporting.h:
  Adding missing constant MAX_SLAVE_ERRMSG.
  Adding const modifier to Slave_reporting_capability::report().
  Hiding and renaming member variable last_error and incorporating
  member function for access in order to make it mutable.
sql/rpl_rli.h:
  Moving constant MAX_SLAVE_ERRMSG.
sql/rpl_utility.cc:
  Adding missing include file rpl_rli.h.
sql/slave.cc:
  Replacing use of member variable last_error with call to member function
  last_error().
  Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
2007-06-11 22:15:39 +02:00

174 lines
5.4 KiB
C++

#include "mysql_priv.h"
#include "rpl_rli.h"
#include "rpl_record_old.h"
size_t
pack_row_old(TABLE *table, MY_BITMAP const* cols,
uchar *row_data, const uchar *record)
{
Field **p_field= table->field, *field;
int n_null_bytes= table->s->null_bytes;
uchar *ptr;
uint i;
my_ptrdiff_t const rec_offset= record - table->record[0];
my_ptrdiff_t const def_offset= table->s->default_values - table->record[0];
memcpy(row_data, record, n_null_bytes);
ptr= row_data+n_null_bytes;
for (i= 0 ; (field= *p_field) ; i++, p_field++)
{
if (bitmap_is_set(cols,i))
{
my_ptrdiff_t const offset=
field->is_null(rec_offset) ? def_offset : rec_offset;
field->move_field_offset(offset);
ptr= field->pack(ptr, field->ptr);
field->move_field_offset(-offset);
}
}
return (static_cast<size_t>(ptr - row_data));
}
/*
Unpack a row into a record.
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 be set to 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.
RETURN VALUE
Error code, or zero if no error. The following error codes can
be returned:
ER_NO_DEFAULT_FOR_FIELD
Returned if one of the fields existing on the slave but not on
the master does not have a default value (and isn't nullable)
*/
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
int
unpack_row_old(RELAY_LOG_INFO *rli,
TABLE *table, uint const colcnt, uchar *record,
uchar const *row, MY_BITMAP const *cols,
uchar const **row_end, ulong *master_reclength,
MY_BITMAP* const rw_set, Log_event_type const event_type)
{
DBUG_ASSERT(record && row);
my_ptrdiff_t const offset= record - (uchar*) table->record[0];
size_t master_null_bytes= table->s->null_bytes;
if (colcnt != table->s->fields)
{
Field **fptr= &table->field[colcnt-1];
do
master_null_bytes= (*fptr)->last_null_byte();
while (master_null_bytes == Field::LAST_NULL_BYTE_UNDEF &&
fptr-- > table->field);
/*
If master_null_bytes is LAST_NULL_BYTE_UNDEF (0) at this time,
there were no nullable fields nor BIT fields at all in the
columns that are common to the master and the slave. In that
case, there is only one null byte holding the X bit.
OBSERVE! There might still be nullable columns following the
common columns, so table->s->null_bytes might be greater than 1.
*/
if (master_null_bytes == Field::LAST_NULL_BYTE_UNDEF)
master_null_bytes= 1;
}
DBUG_ASSERT(master_null_bytes <= table->s->null_bytes);
memcpy(record, row, master_null_bytes); // [1]
int error= 0;
bitmap_set_all(rw_set);
Field **const begin_ptr = table->field;
Field **field_ptr;
uchar const *ptr= row + master_null_bytes;
Field **const end_ptr= begin_ptr + colcnt;
for (field_ptr= begin_ptr ; field_ptr < end_ptr ; ++field_ptr)
{
Field *const f= *field_ptr;
if (bitmap_is_set(cols, field_ptr - begin_ptr))
{
f->move_field_offset(offset);
ptr= f->unpack(f->ptr, ptr);
f->move_field_offset(-offset);
/* Field...::unpack() cannot return 0 */
DBUG_ASSERT(ptr != NULL);
}
else
bitmap_clear_bit(rw_set, field_ptr - begin_ptr);
}
*row_end = ptr;
if (master_reclength)
{
if (*field_ptr)
*master_reclength = (*field_ptr)->ptr - table->record[0];
else
*master_reclength = table->s->reclength;
}
/*
Set properties for remaining columns, if there are any. We let the
corresponding bit in the write_set be set, to write the value if
it was not there already. We iterate over all remaining columns,
even if there were an error, to get as many error messages as
possible. We are still able to return a pointer to the next row,
so redo that.
This generation of error messages is only relevant when inserting
new rows.
*/
for ( ; *field_ptr ; ++field_ptr)
{
uint32 const mask= NOT_NULL_FLAG | NO_DEFAULT_VALUE_FLAG;
DBUG_PRINT("debug", ("flags = 0x%x, mask = 0x%x, flags & mask = 0x%x",
(*field_ptr)->flags, mask,
(*field_ptr)->flags & mask));
if (event_type == WRITE_ROWS_EVENT &&
((*field_ptr)->flags & mask) == mask)
{
rli->report(ERROR_LEVEL, ER_NO_DEFAULT_FOR_FIELD,
"Field `%s` of table `%s`.`%s` "
"has no default value and cannot be NULL",
(*field_ptr)->field_name, table->s->db.str,
table->s->table_name.str);
error = ER_NO_DEFAULT_FOR_FIELD;
}
else
(*field_ptr)->set_default();
}
return error;
}
#endif