Commit 95a7f058 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses #973

reintroduce change that saves memcpy when primary key is covering index,
will add note to release notes stating not to have prefix as part of primary key

git-svn-id: file:///svn/mysql/tokudb-engine/src@5068 c7de825b-a66e-492c-adef-691d508d4ae1
parent c3964a36
...@@ -2436,9 +2436,14 @@ int ha_tokudb::read_row(int error, uchar * buf, uint keynr, DBT * row, DBT * fou ...@@ -2436,9 +2436,14 @@ int ha_tokudb::read_row(int error, uchar * buf, uint keynr, DBT * row, DBT * fou
// TOKUDB_DBUG_DUMP("row=", row->data, row->size); // TOKUDB_DBUG_DUMP("row=", row->data, row->size);
unpack_row(buf, &current_row, &key); unpack_row(buf, &current_row, &key);
} }
else {
if (key_read && !hidden_primary_key) {
unpack_key(buf, found_key, keynr);
}
else { else {
unpack_row(buf, row, found_key); unpack_row(buf, row, found_key);
} }
}
if (found_key) { DBUG_DUMP("read row key", (uchar *) found_key->data, found_key->size); } if (found_key) { DBUG_DUMP("read row key", (uchar *) found_key->data, found_key->size); }
TOKUDB_DBUG_RETURN(0); TOKUDB_DBUG_RETURN(0);
} }
......
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