Commit 711ade74 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

port to mysql-5.1.23. close #486

git-svn-id: file:///svn/mysql/tokudb-engine/src@2621 c7de825b-a66e-492c-adef-691d508d4ae1
parent e0ffaea6
...@@ -981,7 +981,7 @@ void ha_tokudb::unpack_key(uchar * record, DBT * key, uint index) { ...@@ -981,7 +981,7 @@ void ha_tokudb::unpack_key(uchar * record, DBT * key, uint index) {
record[key_part->null_offset] &= ~key_part->null_bit; record[key_part->null_offset] &= ~key_part->null_bit;
} }
pos = (uchar *) key_part->field->unpack_key(record + key_part->field->offset(record), pos, pos = (uchar *) key_part->field->unpack_key(record + key_part->field->offset(record), pos,
#if MYSQL_VERSION_ID <= 60003 #if MYSQL_VERSION_ID < 50123
key_part->length); key_part->length);
#else #else
key_part->length, table->s->db_low_byte_first); key_part->length, table->s->db_low_byte_first);
...@@ -1022,7 +1022,7 @@ DBT *ha_tokudb::create_key(DBT * key, uint keynr, uchar * buff, const uchar * re ...@@ -1022,7 +1022,7 @@ DBT *ha_tokudb::create_key(DBT * key, uint keynr, uchar * buff, const uchar * re
*buff++ = 1; // Store NOT NULL marker *buff++ = 1; // Store NOT NULL marker
} }
buff = key_part->field->pack_key(buff, (uchar *) (record + key_part->offset), buff = key_part->field->pack_key(buff, (uchar *) (record + key_part->offset),
#if MYSQL_VERSION_ID <= 60003 #if MYSQL_VERSION_ID < 50123
key_part->length); key_part->length);
#else #else
key_part->length, table->s->db_low_byte_first); key_part->length, table->s->db_low_byte_first);
...@@ -1066,7 +1066,7 @@ DBT *ha_tokudb::pack_key(DBT * key, uint keynr, uchar * buff, const uchar * key_ ...@@ -1066,7 +1066,7 @@ DBT *ha_tokudb::pack_key(DBT * key, uint keynr, uchar * buff, const uchar * key_
offset = 1; // Data is at key_ptr+1 offset = 1; // Data is at key_ptr+1
} }
buff = key_part->field->pack_key_from_key_image(buff, (uchar *) key_ptr + offset, buff = key_part->field->pack_key_from_key_image(buff, (uchar *) key_ptr + offset,
#if MYSQL_VERSION_ID <= 60003 #if MYSQL_VERSION_ID < 50123
key_part->length); key_part->length);
#else #else
key_part->length, table->s->db_low_byte_first); key_part->length, table->s->db_low_byte_first);
...@@ -2495,7 +2495,7 @@ mysql_declare_plugin(tokudb) { ...@@ -2495,7 +2495,7 @@ mysql_declare_plugin(tokudb) {
&storage_engine_structure, &storage_engine_structure,
"TokuDB", "TokuDB",
"Tokutek Inc", "Tokutek Inc",
"Supports transactions and row locking", "Fractal trees with transactions, row level locks",
PLUGIN_LICENSE_BSD, /* QQQ license? */ PLUGIN_LICENSE_BSD, /* QQQ license? */
tokudb_init_func, /* plugin init */ tokudb_init_func, /* plugin init */
tokudb_done_func, /* plugin deinit */ tokudb_done_func, /* plugin deinit */
......
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