1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ha_cassandra to compile

Browse Source
This commit is contained in:
Sergei Golubchik 2013-01-24 17:52:25 +01:00
parent 259a9404f3
commit a48c2f461e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/cassandra/ha_cassandra.cc
View File

@ -879,7 +879,7 @@ static void alloc_strings_memroot(MEM_ROOT *mem_root)
(36 + 1 + ALIGN_SIZE(sizeof(USED_MEM))) * 10 + (36 + 1 + ALIGN_SIZE(sizeof(USED_MEM))) * 10 +
ALLOC_ROOT_MIN_BLOCK_SIZE, ALLOC_ROOT_MIN_BLOCK_SIZE,
(36 + 1 + ALIGN_SIZE(sizeof(USED_MEM))) * 10 + (36 + 1 + ALIGN_SIZE(sizeof(USED_MEM))) * 10 +
ALLOC_ROOT_MIN_BLOCK_SIZE); ALLOC_ROOT_MIN_BLOCK_SIZE, MYF(MY_THREAD_SPECIFIC));
} }
} }
@ -1469,12 +1469,12 @@ bool ha_cassandra::setup_field_converters(Field **field_arg, uint n_fields)
if (my_init_dynamic_array(&dynamic_values, if (my_init_dynamic_array(&dynamic_values,
sizeof(DYNAMIC_COLUMN_VALUE), sizeof(DYNAMIC_COLUMN_VALUE),
DYNCOL_USUAL, DYNCOL_DELTA)) DYNCOL_USUAL, DYNCOL_DELTA, MYF(0)))
DBUG_RETURN(true); DBUG_RETURN(true);
else else
if (my_init_dynamic_array(&dynamic_names, if (my_init_dynamic_array(&dynamic_names,
sizeof(LEX_STRING), sizeof(LEX_STRING),
DYNCOL_USUAL, DYNCOL_DELTA)) DYNCOL_USUAL, DYNCOL_DELTA,MYF(0)))
{ {
delete_dynamic(&dynamic_values); delete_dynamic(&dynamic_values);
DBUG_RETURN(true); DBUG_RETURN(true);