Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl

into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
26c831f7 · mats@romeo.(none) · eea3e3d6 · 090e0209 · 26c831f7 · 26c831f7
Commit 26c831f7 authored Sep 08, 2006 by mats@romeo.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/log_event.cc sql/log_event.cc +1 -1

sql/rpl_utility.cc sql/rpl_utility.cc +2 -0

No files found.
--- 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;
    }

--- 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;
 }

 /*********************************************************************