mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@47605 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:02:14 -04:00 • committed by Yoni Fogel
parent efef9b0605
commit 3d6a688583
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/tokudb/ha_tokudb_alter_56.cc
View file

@ -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:

6
storage/tokudb/ha_tokudb_update_fun.cc
View file

@ -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