diff options
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/rpl_utility.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 2a8fd085eee..0f2bf10212b 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -5369,7 +5369,7 @@ unpack_row(RELAY_LOG_INFO *rli, if (master_reclength) { if (*field_ptr) - *master_reclength = (*field_ptr)->ptr - table->record[0]; + *master_reclength = (*field_ptr)->ptr - (char*) table->record[0]; else *master_reclength = table->s->reclength; } diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index fc706178aa3..5405d022223 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -96,6 +96,8 @@ field_length_from_packed(enum_field_types const field_type, length= ~0UL; // NYI break; } + + return length; } /********************************************************************* |