summaryrefslogtreecommitdiff
path: root/storage/cassandra
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-24 17:52:25 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-24 17:52:25 +0100
commita48c2f461e81f8dd2a7058107fc0acff0b578fdd (patch)
treef2eb370ea2939f2f93f07aa9d9b77ae67fb106db /storage/cassandra
parent259a9404f349406b053f4a271ef8a356dc0f2d3a (diff)
downloadmariadb-git-a48c2f461e81f8dd2a7058107fc0acff0b578fdd.tar.gz
fix ha_cassandra to compile
Diffstat (limited to 'storage/cassandra')
-rw-r--r--storage/cassandra/ha_cassandra.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc
index 811374b2a57..3934f288085 100644
--- a/storage/cassandra/ha_cassandra.cc
+++ b/storage/cassandra/ha_cassandra.cc
@@ -879,7 +879,7 @@ static void alloc_strings_memroot(MEM_ROOT *mem_root)
(36 + 1 + ALIGN_SIZE(sizeof(USED_MEM))) * 10 +
ALLOC_ROOT_MIN_BLOCK_SIZE,
(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,
sizeof(DYNAMIC_COLUMN_VALUE),
- DYNCOL_USUAL, DYNCOL_DELTA))
+ DYNCOL_USUAL, DYNCOL_DELTA, MYF(0)))
DBUG_RETURN(true);
else
if (my_init_dynamic_array(&dynamic_names,
sizeof(LEX_STRING),
- DYNCOL_USUAL, DYNCOL_DELTA))
+ DYNCOL_USUAL, DYNCOL_DELTA,MYF(0)))
{
delete_dynamic(&dynamic_values);
DBUG_RETURN(true);