Commit c79edd7d authored by unknown's avatar unknown
Browse files

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
parents a6a1aba2 ec36a7aa

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

sql/rpl_utility.cc

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ field_length_from_packed(enum_field_types const field_type, 
    length= ~0UL;                               // NYI

    break;

  }



  return length;

}



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