1 files changed, 3 insertions, 5 deletions
diff --git a/storage/cassandra/ha_cassandra.h b/storage/cassandra/ha_cassandra.h
index 595b840d360..30958e4e17c 100644
--- a/storage/cassandra/ha_cassandra.h
+++ b/storage/cassandra/ha_cassandra.h
@@ -36,19 +36,17 @@ class ha_cassandra: public handler
   
   Cassandra_se_interface *se;
 
-  /* pre-allocated array of #fields elements */
-  NameAndValue *names_and_vals;
-  NameAndValue *get_names_and_vals();
-
-
   ColumnDataConverter **field_converters;
   uint n_field_converters;
   bool setup_field_converters(Field **field, uint n_fields);
   void free_field_converters();
+  
+  void read_cassandra_columns();
 public:
   ha_cassandra(handlerton *hton, TABLE_SHARE *table_arg);
   ~ha_cassandra()
   {
+    free_field_converters();
     delete se;
   }