Commit 4e0a48bf authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

refs #5789 fix compile problems from 51072

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@51075 c7de825b-a66e-492c-adef-691d508d4ae1
parent ff9653d0
...@@ -1145,8 +1145,8 @@ static int tokudb_dictionary_info(TABLE *table, THD *thd) { ...@@ -1145,8 +1145,8 @@ static int tokudb_dictionary_info(TABLE *table, THD *thd) {
// We store the NULL terminator in the directory so it's included in the size. // We store the NULL terminator in the directory so it's included in the size.
// See #5789 // See #5789
// Recalculate and check just to be safe. // Recalculate and check just to be safe.
size_t dname_len = strlen(curr_key.data); size_t dname_len = strlen((const char *)curr_key.data);
size_t iname_len = strlen(curr_val.data); size_t iname_len = strlen((const char *)curr_val.data);
assert(dname_len == curr_key.size - 1); assert(dname_len == curr_key.size - 1);
assert(iname_len == curr_val.size - 1); assert(iname_len == curr_val.size - 1);
table->field[0]->store( table->field[0]->store(
...@@ -1208,20 +1208,22 @@ static int tokudb_report_fractal_tree_info_for_db(const DBT *dname, const DBT *i ...@@ -1208,20 +1208,22 @@ static int tokudb_report_fractal_tree_info_for_db(const DBT *dname, const DBT *i
// We store the NULL terminator in the directory so it's included in the size. // We store the NULL terminator in the directory so it's included in the size.
// See #5789 // See #5789
// Recalculate and check just to be safe. // Recalculate and check just to be safe.
size_t dname_len = strlen(dname->data); {
size_t iname_len = strlen(iname->data); size_t dname_len = strlen((const char *)dname->data);
assert(dname_len == dname->size - 1); size_t iname_len = strlen((const char *)iname->data);
assert(iname_len == iname->size - 1); assert(dname_len == dname->size - 1);
table->field[0]->store( assert(iname_len == iname->size - 1);
(char *)dname->data, table->field[0]->store(
dname_len, (char *)dname->data,
system_charset_info dname_len,
); system_charset_info
table->field[1]->store( );
(char *)iname->data, table->field[1]->store(
iname_len, (char *)iname->data,
system_charset_info iname_len,
); system_charset_info
);
}
table->field[2]->store(bt_num_blocks_allocated, false); table->field[2]->store(bt_num_blocks_allocated, false);
table->field[3]->store(bt_num_blocks_in_use, false); table->field[3]->store(bt_num_blocks_in_use, false);
table->field[4]->store(bt_size_allocated, false); table->field[4]->store(bt_size_allocated, false);
...@@ -1349,8 +1351,8 @@ static int tokudb_report_fractal_tree_block_map_for_db(const DBT *dname, const D ...@@ -1349,8 +1351,8 @@ static int tokudb_report_fractal_tree_block_map_for_db(const DBT *dname, const D
// We store the NULL terminator in the directory so it's included in the size. // We store the NULL terminator in the directory so it's included in the size.
// See #5789 // See #5789
// Recalculate and check just to be safe. // Recalculate and check just to be safe.
size_t dname_len = strlen(dname->data); size_t dname_len = strlen((const char *)dname->data);
size_t iname_len = strlen(iname->data); size_t iname_len = strlen((const char *)iname->data);
assert(dname_len == dname->size - 1); assert(dname_len == dname->size - 1);
assert(iname_len == iname->size - 1); assert(iname_len == iname->size - 1);
table->field[0]->store( table->field[0]->store(
......
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