Commit 69d2176e authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:4541], make handlerton change

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@41539 c7de825b-a66e-492c-adef-691d508d4ae1
parent 82429994
...@@ -1524,7 +1524,7 @@ int tokudb_compare_two_keys( ...@@ -1524,7 +1524,7 @@ int tokudb_compare_two_keys(
int tokudb_cmp_dbt_key(DB* file, const DBT *keya, const DBT *keyb) { int tokudb_cmp_dbt_key(DB* file, const DBT *keya, const DBT *keyb) {
int cmp; int cmp;
if (file->descriptor->dbt.size == 0) { if (file->cmp_descriptor->dbt.size == 0) {
int num_bytes_cmp = keya->size < keyb->size ? int num_bytes_cmp = keya->size < keyb->size ?
keya->size : keyb->size; keya->size : keyb->size;
cmp = memcmp(keya->data,keyb->data,num_bytes_cmp); cmp = memcmp(keya->data,keyb->data,num_bytes_cmp);
...@@ -1538,8 +1538,8 @@ int tokudb_cmp_dbt_key(DB* file, const DBT *keya, const DBT *keyb) { ...@@ -1538,8 +1538,8 @@ int tokudb_cmp_dbt_key(DB* file, const DBT *keya, const DBT *keyb) {
keya->size, keya->size,
keyb->data, keyb->data,
keyb->size, keyb->size,
(uchar *)file->descriptor->dbt.data + 4, (uchar *)file->cmp_descriptor->dbt.data + 4,
(*(u_int32_t *)file->descriptor->dbt.data) - 4, (*(u_int32_t *)file->cmp_descriptor->dbt.data) - 4,
false false
); );
} }
...@@ -1553,8 +1553,8 @@ int tokudb_prefix_cmp_dbt_key(DB *file, const DBT *keya, const DBT *keyb) { ...@@ -1553,8 +1553,8 @@ int tokudb_prefix_cmp_dbt_key(DB *file, const DBT *keya, const DBT *keyb) {
keya->size, keya->size,
keyb->data, keyb->data,
keyb->size, keyb->size,
(uchar *)file->descriptor->dbt.data + 4, (uchar *)file->cmp_descriptor->dbt.data + 4,
*(u_int32_t *)file->descriptor->dbt.data - 4, *(u_int32_t *)file->cmp_descriptor->dbt.data - 4,
true true
); );
return cmp; return cmp;
......
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