Commit 3d6a6885 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

refs #5333, make debug compilation fix for mysql 5.5 (MariaDB showed no issues)

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@47605 c7de825b-a66e-492c-adef-691d508d4ae1
parent efef9b06
......@@ -688,7 +688,8 @@ ha_tokudb::alter_table_expand_varchar_columns(TABLE *altered_table, Alter_inplac
uint32_t offset_end = offset_start + share->kc_info.mcp_info[i].len_of_offsets;
// make the expand varchar offsets message
DBT expand = {};
DBT expand;
memset(&expand, 0, sizeof(expand));
expand.size = sizeof (uchar) + sizeof offset_start + sizeof offset_end;
expand.data = my_malloc(expand.size, MYF(MY_WME));
if (!expand.data) {
......@@ -845,7 +846,8 @@ ha_tokudb::alter_table_expand_one_column(TABLE *altered_table, Alter_inplace_inf
uchar operation;
// make the expand int field message
DBT expand = {};
DBT expand;
memset(&expand, 0, sizeof(expand));
expand.size = 1+4+4+4+4;
switch (old_field_type) {
case toku_type_int:
......
......@@ -652,7 +652,8 @@ tokudb_expand_varchar_offsets(
assert(offset_start < old_val->size);
assert(offset_start + number_of_offsets < old_val->size);
DBT new_val = {};
DBT new_val;
memset(&new_val, 0, sizeof(new_val));
if (old_val != NULL) {
// compute the new val from the old val
......@@ -759,7 +760,8 @@ tokudb_expand_field(
assert(new_length >= old_length); // expand only
assert(old_offset + old_length <= old_val->size); // old field within the old val
DBT new_val = {};
DBT new_val;
memset(&new_val, 0, sizeof(new_val));
if (old_val != NULL) {
// compute the new val from the old val
......
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