Commit 9368cd0f authored by unknown's avatar unknown

fix alignment issues

parent 4fd1524c
...@@ -1522,7 +1522,7 @@ void ha_federated::position(const byte *record) ...@@ -1522,7 +1522,7 @@ void ha_federated::position(const byte *record)
{ {
DBUG_ENTER("ha_federated::position"); DBUG_ENTER("ha_federated::position");
//ha_store_ptr Add seek storage //ha_store_ptr Add seek storage
*(MYSQL_ROW_OFFSET *)ref=current_position; *(MYSQL_ROW_OFFSET *)ref=current_position; // ref is always aligned
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -1541,7 +1541,7 @@ int ha_federated::rnd_pos(byte * buf, byte *pos) ...@@ -1541,7 +1541,7 @@ int ha_federated::rnd_pos(byte * buf, byte *pos)
{ {
DBUG_ENTER("ha_federated::rnd_pos"); DBUG_ENTER("ha_federated::rnd_pos");
statistic_increment(table->in_use->status_var.ha_read_rnd_count,&LOCK_status); statistic_increment(table->in_use->status_var.ha_read_rnd_count,&LOCK_status);
current_position= *(MYSQL_ROW_OFFSET *)pos; memcpy(current_position, pos, sizeof(MYSQL_ROW_OFFSET)); // pos is not aligned
result->current_row= 0; result->current_row= 0;
result->data_cursor= current_position; result->data_cursor= current_position;
DBUG_RETURN(rnd_next(buf)); DBUG_RETURN(rnd_next(buf));
......
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