- Enable mapping of CHAR(n)

- preparations for support of bulk INSERT.

2 files changed, 17 insertions, 2 deletions

diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc
index d1006a6e816..29159828a97 100644
--- a/storage/cassandra/ha_cassandra.cc
+++ b/storage/cassandra/ha_cassandra.cc
@@ -527,7 +527,7 @@ ColumnDataConverter *map_field_to_validator(Field *field, const char *validator_
 
     case MYSQL_TYPE_VAR_STRING:
     case MYSQL_TYPE_VARCHAR:
-    //case MYSQL_TYPE_STRING:  <-- todo: should we allow end-padded 'CHAR(N)'?
+    case MYSQL_TYPE_STRING: // these are space padded strings.
       if (!strcmp(validator_name, validator_blob) ||
           !strcmp(validator_name, validator_ascii) ||
           !strcmp(validator_name, validator_text))
@@ -893,7 +893,19 @@ int ha_cassandra::rnd_pos(uchar *buf, uchar *pos)
   DBUG_RETURN(rc);
 }
 
+#if 0
+void ha_cassandra::start_bulk_insert(ha_rows rows)
+{
+  /* Do nothing? */
+}
+
 
+int ha_cassandra::end_bulk_insert()
+{
+  // TODO!
+  return 0;
+}
+#endif 
 /////////////////////////////////////////////////////////////////////////////
 // Dummy implementations start
 /////////////////////////////////////////////////////////////////////////////
diff --git a/storage/cassandra/ha_cassandra.h b/storage/cassandra/ha_cassandra.h
index cca70814b1b..469440a0049 100644
--- a/storage/cassandra/ha_cassandra.h
+++ b/storage/cassandra/ha_cassandra.h
@@ -145,7 +145,10 @@ public:
   */
   virtual double read_time(uint, uint, ha_rows rows)
   { return (double) rows /  20.0+1; }
-
+#if 0
+  virtual void start_bulk_insert(ha_rows rows);
+  virtual int end_bulk_insert();
+#endif  
   /*
     Everything below are methods that we implement in ha_example.cc.