summaryrefslogtreecommitdiff
path: root/storage/cassandra
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-09-26 14:57:45 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-09-26 14:57:45 +0400
commit0362968be82c391db9d19230090f4a7d95092018 (patch)
tree42dcea1cfd029096f6637390c9c494803de3842a /storage/cassandra
parent344c0ea4232a4954a6eb83195bb78cace03bd4c4 (diff)
downloadmariadb-git-0362968be82c391db9d19230090f4a7d95092018.tar.gz
Cassandra SE:
- Add a test for ALTER TABLE
Diffstat (limited to 'storage/cassandra')
-rw-r--r--storage/cassandra/cassandra_se.cc4
-rw-r--r--storage/cassandra/ha_cassandra.cc3
2 files changed, 3 insertions, 4 deletions
diff --git a/storage/cassandra/cassandra_se.cc b/storage/cassandra/cassandra_se.cc
index 7a825a9fc00..e46d02f48d9 100644
--- a/storage/cassandra/cassandra_se.cc
+++ b/storage/cassandra/cassandra_se.cc
@@ -594,8 +594,8 @@ bool Cassandra_se_impl::retryable_remove_row()
}
/*
- This function will try a Cassandra operation, and handle errors.
-
+ Try calling a function, catching possible Cassandra errors, and re-trying
+ for "transient" errors.
*/
bool Cassandra_se_impl::try_operation(retryable_func_t func_to_call)
{
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc
index 187df2a2dd8..df4b54cc4f7 100644
--- a/storage/cassandra/ha_cassandra.cc
+++ b/storage/cassandra/ha_cassandra.cc
@@ -1676,9 +1676,8 @@ int ha_cassandra::delete_table(const char *name)
bool ha_cassandra::check_if_incompatible_data(HA_CREATE_INFO *info,
uint table_changes)
{
- //ha_table_option_struct *param_old, *param_new;
DBUG_ENTER("ha_cassandra::check_if_incompatible_data");
-
+ /* Checked, we intend to have this empty for Cassandra SE. */
DBUG_RETURN(COMPATIBLE_DATA_YES);
}