Commit a77902c5 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses #830

comment out DB_DBT_DUPOK usage, which fractal tree
does not understand at the moment

git-svn-id: file:///svn/mysql/tokudb-engine/src@3956 c7de825b-a66e-492c-adef-691d508d4ae1
parent 05a60c31
...@@ -1310,7 +1310,11 @@ DBT *ha_tokudb::create_key(DBT * key, uint keynr, uchar * buff, const uchar * re ...@@ -1310,7 +1310,11 @@ DBT *ha_tokudb::create_key(DBT * key, uint keynr, uchar * buff, const uchar * re
/* Store 0 if the key part is a NULL part */ /* Store 0 if the key part is a NULL part */
if (record[key_part->null_offset] & key_part->null_bit) { if (record[key_part->null_offset] & key_part->null_bit) {
*buff++ = 0; *buff++ = 0;
key->flags |= DB_DBT_DUPOK; //
// fractal tree does not handle this falg at the moment
// so commenting out for now
//
//key->flags |= DB_DBT_DUPOK;
continue; continue;
} }
*buff++ = 1; // Store NOT NULL marker *buff++ = 1; // Store NOT NULL marker
...@@ -1359,7 +1363,11 @@ DBT *ha_tokudb::pack_key(DBT * key, uint keynr, uchar * buff, const uchar * key_ ...@@ -1359,7 +1363,11 @@ DBT *ha_tokudb::pack_key(DBT * key, uint keynr, uchar * buff, const uchar * key_
{ {
key_length -= key_part->store_length; key_length -= key_part->store_length;
key_ptr += key_part->store_length; key_ptr += key_part->store_length;
key->flags |= DB_DBT_DUPOK; //
// fractal tree does not handle this falg at the moment
// so commenting out for now
//
//key->flags |= DB_DBT_DUPOK;
continue; continue;
} }
offset = 1; // Data is at key_ptr+1 offset = 1; // Data is at key_ptr+1
......
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