10.0-base merge

2 files changed, 7 insertions, 22 deletions

diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc
index e8c5b844e3d..a9a97806a7e 100644
--- a/storage/cassandra/ha_cassandra.cc
+++ b/storage/cassandra/ha_cassandra.cc
@@ -369,16 +369,6 @@ ha_cassandra::ha_cassandra(handlerton *hton, TABLE_SHARE *table_arg)
 {}
 
 
-static const char *ha_cassandra_exts[] = {
-  NullS
-};
-
-const char **ha_cassandra::bas_ext() const
-{
-  return ha_cassandra_exts;
-}
-
-
 int ha_cassandra::connect_and_check_options(TABLE *table_arg)
 {
   ha_table_option_struct *options= table_arg->s->option_struct;
@@ -2578,21 +2568,21 @@ struct st_mysql_storage_engine cassandra_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 static SHOW_VAR cassandra_status_variables[]= {
-  {"Cassandra_row_inserts",
+  {"row_inserts",
     (char*) &cassandra_counters.row_inserts,         SHOW_LONG},
-  {"Cassandra_row_insert_batches",
+  {"row_insert_batches",
     (char*) &cassandra_counters.row_insert_batches,  SHOW_LONG},
 
-  {"Cassandra_multiget_keys_scanned",
+  {"multiget_keys_scanned",
     (char*) &cassandra_counters.multiget_keys_scanned, SHOW_LONG},
-  {"Cassandra_multiget_reads",
+  {"multiget_reads",
     (char*) &cassandra_counters.multiget_reads,      SHOW_LONG},
-  {"Cassandra_multiget_rows_read",
+  {"multiget_rows_read",
     (char*) &cassandra_counters.multiget_rows_read,  SHOW_LONG},
 
-  {"Cassandra_timeout_exceptions",
+  {"timeout_exceptions",
     (char*) &cassandra_counters.timeout_exceptions, SHOW_LONG},
-  {"Cassandra_unavailable_exceptions",
+  {"unavailable_exceptions",
     (char*) &cassandra_counters.unavailable_exceptions, SHOW_LONG},
   {NullS, NullS, SHOW_LONG}
 };
diff --git a/storage/cassandra/ha_cassandra.h b/storage/cassandra/ha_cassandra.h
index cb2f9fb237b..0c225c58780 100644
--- a/storage/cassandra/ha_cassandra.h
+++ b/storage/cassandra/ha_cassandra.h
@@ -132,11 +132,6 @@ public:
   const char *index_type(uint inx) { return "HASH"; }
 
   /** @brief
-    The file extensions.
-   */
-  const char **bas_ext() const;
-
-  /** @brief
     This is a list of flags that indicate what functionality the storage engine
     implements. The current table flags are documented in handler.h
   */