Commit de6b7993 authored by unknown's avatar unknown

Patches to fix problems on Windows


sql/log_event.cc:
  Adding cast since byte is unsigned char on Windows
sql/rpl_utility.cc:
  Adding missing return statement.
parent f17a35a9
...@@ -5369,7 +5369,7 @@ unpack_row(RELAY_LOG_INFO *rli, ...@@ -5369,7 +5369,7 @@ unpack_row(RELAY_LOG_INFO *rli,
if (master_reclength) if (master_reclength)
{ {
if (*field_ptr) if (*field_ptr)
*master_reclength = (*field_ptr)->ptr - table->record[0]; *master_reclength = (*field_ptr)->ptr - (char*) table->record[0];
else else
*master_reclength = table->s->reclength; *master_reclength = table->s->reclength;
} }
......
...@@ -96,6 +96,8 @@ field_length_from_packed(enum_field_types const field_type, ...@@ -96,6 +96,8 @@ field_length_from_packed(enum_field_types const field_type,
length= ~0UL; // NYI length= ~0UL; // NYI
break; break;
} }
return length;
} }
/********************************************************************* /*********************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment