Merge lp:~stewart/drizzle/remove-unused-row-type-in-table-message into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/309/

The explicit row_type entry was not being used. Everything has moved to ROW_FORMAT as an engine option.

Also see https://bugs.launchpad.net/drizzle/+bug/599605 for a bug discovered
while creating this patch.

[Brian Aker (brianaker)]

Hi!

The collation should be explicitly expressed in the replication stream (we go for explicit over implicit).

Cheers,
  -Brian

[Brian Aker (brianaker)]

review: Needs Fixing

[Stewart Smith (stewart)]

perhaps a SQL dialect that has everything explicit?

I'd prefer to do this a bit later as I'm mostly focused on minimal changes to get SHOW CREATE working (and the foreign key information in) and don't want to change too much at once.

(this comment is probably on the wrong branch too)

[lp:~stewart/drizzle/remove-unused-row-type-in-table-message]

1641. By Stewart Smith on 2010-07-05

Merged default-collation-in-table-message into remove-unused-row-type-in-table-message.

1642. By Stewart Smith on 2010-07-13

merge trunk

1643. By Stewart Smith on 2010-07-19

Merged default-collation-in-table-message into remove-unused-row-type-in-table-message.

1644. By Stewart Smith on 2010-07-20

merge trunk

1645. By Stewart Smith on 2010-07-27

merge trunk

Unmerged revisions

=== modified file 'drizzled/cursor.h'
--- drizzled/cursor.h	2010-07-16 04:20:32 +0000
+++ drizzled/cursor.h	2010-07-27 23:22:44 +0000
@@ -320,12 +320,6 @@
   virtual ha_rows estimate_rows_upper_bound()
   { return stats.records+EXTRA_RECORDS; }
 
-  /**
-    Get the row type from the storage engine.  If this method returns
-    ROW_TYPE_NOT_USED, the information in HA_CREATE_INFO should be used.
-  */
-  virtual enum row_type get_row_type() const { return ROW_TYPE_NOT_USED; }
-
   virtual const char *index_type(uint32_t)
   { assert(0); return "";}
 
 
=== modified file 'drizzled/enum.h'
--- drizzled/enum.h	2010-06-24 05:34:43 +0000
+++ drizzled/enum.h	2010-07-27 23:22:44 +0000
@@ -107,18 +107,6 @@
   OPT_GLOBAL
 };
 
-enum row_type
-{
-  ROW_TYPE_NOT_USED=-1,
-  ROW_TYPE_DEFAULT,
-  ROW_TYPE_FIXED,
-  ROW_TYPE_DYNAMIC,
-  ROW_TYPE_COMPRESSED,
-  ROW_TYPE_REDUNDANT,
-  ROW_TYPE_COMPACT,
-  ROW_TYPE_PAGE
-};
-
 enum column_format_type
 {
   COLUMN_FORMAT_TYPE_NOT_USED= -1,
 
=== modified file 'drizzled/handler_structs.h'
--- drizzled/handler_structs.h	2010-05-15 01:19:45 +0000
+++ drizzled/handler_structs.h	2010-07-27 23:22:44 +0000
@@ -55,7 +55,6 @@
   uint64_t auto_increment_value;
   uint32_t table_options;
   uint32_t used_fields;
-  enum row_type row_type;
   plugin::StorageEngine *db_type;
   bool table_existed;			/* 1 in create if table existed */
 } HA_CREATE_INFO;
 
=== modified file 'drizzled/message/statement_transform.cc'
--- drizzled/message/statement_transform.cc	2010-05-13 00:24:20 +0000
+++ drizzled/message/statement_transform.cc	2010-07-27 23:22:44 +0000
@@ -932,14 +932,6 @@
     destination.append(ss.str());
     ss.clear();
   }
-  
-  if (options.has_row_type())
-  {
-    ss << options.row_type();
-    destination.append("\nROW_TYPE = ", 12);
-    destination.append(ss.str());
-    ss.clear();
-  }
 
   if (options.has_data_file_name())
   {
 
=== modified file 'drizzled/message/table.proto'
--- drizzled/message/table.proto	2010-07-19 23:43:11 +0000
+++ drizzled/message/table.proto	2010-07-27 23:22:44 +0000
@@ -31,18 +31,6 @@
     optional bool checksum = 17;
     optional bool page_checksum = 18;
     optional bool delay_key_write = 19;
-
-    enum RowType {
-    	 ROW_TYPE_DEFAULT = 0;
-	 ROW_TYPE_FIXED = 1;
-	 ROW_TYPE_DYNAMIC = 2;
-      	 ROW_TYPE_COMPRESSED = 3;
-         ROW_TYPE_REDUNDANT = 4;
-	 ROW_TYPE_COMPACT = 5;
-	 ROW_TYPE_PAGE = 6;
-    }
-
-    optional RowType row_type = 20;
   }
 
   message ForeignKeyConstraint {
 
=== modified file 'drizzled/show.cc'
--- drizzled/show.cc	2010-07-19 20:29:33 +0000
+++ drizzled/show.cc	2010-07-27 23:22:44 +0000
@@ -471,7 +471,7 @@
 
   key_info= table->key_info;
   memset(&create_info, 0, sizeof(create_info));
-  create_info.row_type= table->getShare()->row_type;
+
   primary_key= table->getShare()->getPrimaryKey();
 
   for (uint32_t i=0 ; i < table->getShare()->sizeKeys() ; i++,key_info++)
@@ -558,13 +558,6 @@
       append_unescaped(packet, option.state().c_str(), option.state().length());
     }
 
-#if 0
-    if (create_info.row_type != ROW_TYPE_DEFAULT)
-    {
-      packet->append(STRING_WITH_LEN(" ROW_FORMAT="));
-      packet->append(ha_row_type[(uint32_t) create_info.row_type]);
-    }
-#endif
     if (table->getShare()->block_size)
     {
       packet->append(STRING_WITH_LEN(" BLOCK_SIZE="));
 
=== modified file 'drizzled/sql_table.cc'
--- drizzled/sql_table.cc	2010-07-15 23:18:11 +0000
+++ drizzled/sql_table.cc	2010-07-27 23:22:44 +0000
@@ -810,7 +810,7 @@
     /** @todo Get rid of this MyISAM-specific crap. */
     if (not create_proto.engine().name().compare("MyISAM") &&
         ((sql_field->flags & BLOB_FLAG) ||
-         (sql_field->sql_type == DRIZZLE_TYPE_VARCHAR && create_info->row_type != ROW_TYPE_FIXED)))
+         (sql_field->sql_type == DRIZZLE_TYPE_VARCHAR)))
       (*db_options)|= HA_OPTION_PACK_RECORD;
     it2.rewind();
   }
@@ -1466,9 +1466,6 @@
   assert(identifier.getTableName() == table_proto.name());
   db_options= create_info->table_options;
 
-  if (create_info->row_type == ROW_TYPE_DYNAMIC)
-    db_options|=HA_OPTION_PACK_RECORD;
-
   set_table_default_charset(create_info, identifier.getSchemaName().c_str());
 
   /* Build a Table object to pass down to the engine, and the do the actual create. */
 
=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy	2010-07-08 18:02:05 +0000
+++ drizzled/sql_yacc.yy	2010-07-27 23:22:44 +0000
@@ -358,7 +358,6 @@
   enum drizzled::sql_var_t var_type;
   drizzled::Key::Keytype key_type;
   enum drizzled::ha_key_alg key_alg;
-  enum drizzled::row_type row_type;
   enum drizzled::column_format_type column_format_type;
   enum drizzled::ha_rkey_function ha_rkey_mode;
   enum drizzled::enum_tx_isolation tx_isolation;
@@ -2124,7 +2123,6 @@
             lex->select_lex.init_order();
             lex->select_lex.db=
               ((TableList*) lex->select_lex.table_list.first)->db;
-            statement->create_info.row_type= ROW_TYPE_NOT_USED;
             statement->alter_info.build_method= $2;
           }
           alter_commands
 
=== modified file 'drizzled/statement/alter_table.cc'
--- drizzled/statement/alter_table.cc	2010-06-22 20:45:28 +0000
+++ drizzled/statement/alter_table.cc	2010-07-27 23:22:44 +0000
@@ -823,8 +823,6 @@
   ha_rows copied= 0;
   ha_rows deleted= 0;
 
-  message::Table *original_table_definition= table->getMutableShare()->getTableProto();
-
   session->set_proc_info("init");
 
   table->use_all_columns();
@@ -865,15 +863,6 @@
     return true;
   }
 
-  if (create_info->row_type == ROW_TYPE_NOT_USED)
-  {
-    message::Table::TableOptions *table_options;
-    table_options= create_proto.mutable_options();
-
-    create_info->row_type= table->getShare()->row_type;
-    table_options->set_row_type(original_table_definition->options().row_type());
-  }
-
   session->set_proc_info("setup");
 
   /*
 
=== modified file 'drizzled/statement/create_index.cc'
--- drizzled/statement/create_index.cc	2010-05-28 01:36:09 +0000
+++ drizzled/statement/create_index.cc	2010-07-27 23:22:44 +0000
@@ -59,8 +59,6 @@
     return true;
   }
 
-  create_info.row_type= ROW_TYPE_NOT_USED;
-
   bool res;
   if (original_table_message.type() == message::Table::STANDARD )
   {
 
=== modified file 'drizzled/statement/drop_index.cc'
--- drizzled/statement/drop_index.cc	2010-05-12 21:58:06 +0000
+++ drizzled/statement/drop_index.cc	2010-07-27 23:22:44 +0000
@@ -63,7 +63,6 @@
 
   memset(&create_info, 0, sizeof(create_info));
   create_info.db_type= 0;
-  create_info.row_type= ROW_TYPE_NOT_USED;
 
   bool res;
   if (original_table_message.type() == message::Table::STANDARD )
 
=== modified file 'drizzled/table_share.cc'
--- drizzled/table_share.cc	2010-07-20 00:27:58 +0000
+++ drizzled/table_share.cc	2010-07-27 23:22:44 +0000
@@ -471,7 +471,6 @@
   timestamp_offset(0),
   reclength(0),
   stored_rec_length(0),
-  row_type(ROW_TYPE_DEFAULT),
   max_rows(0),
   table_proto(NULL),
   storage_engine(NULL),
@@ -544,7 +543,6 @@
   timestamp_offset(0),
   reclength(0),
   stored_rec_length(0),
-  row_type(ROW_TYPE_DEFAULT),
   max_rows(0),
   table_proto(NULL),
   storage_engine(NULL),
@@ -625,7 +623,6 @@
   timestamp_offset(0),
   reclength(0),
   stored_rec_length(0),
-  row_type(ROW_TYPE_DEFAULT),
   max_rows(0),
   table_proto(NULL),
   storage_engine(NULL),
@@ -713,7 +710,6 @@
   timestamp_offset(0),
   reclength(0),
   stored_rec_length(0),
-  row_type(ROW_TYPE_DEFAULT),
   max_rows(0),
   table_proto(NULL),
   storage_engine(NULL),
@@ -903,9 +899,6 @@
   db_create_options= (local_db_create_options & 0x0000FFFF);
   db_options_in_use= db_create_options;
 
-  row_type= table_options.has_row_type() ?
-    (enum row_type) table_options.row_type() : ROW_TYPE_DEFAULT;
-
   block_size= table_options.has_block_size() ?
     table_options.block_size() : 0;
 
 
=== modified file 'drizzled/table_share.h'
--- drizzled/table_share.h	2010-06-29 13:47:17 +0000
+++ drizzled/table_share.h	2010-07-27 23:22:44 +0000
@@ -340,7 +340,6 @@
   uint32_t   reclength;			/* Recordlength */
 public:
   uint32_t   stored_rec_length;         /* Stored record length*/
-  enum row_type row_type;		/* How rows are stored */
 
   uint32_t getRecordLength() const
   {
 
=== modified file 'plugin/archive/ha_archive.h'
--- plugin/archive/ha_archive.h	2010-06-21 15:29:49 +0000
+++ plugin/archive/ha_archive.h	2010-07-27 23:22:44 +0000
@@ -122,10 +122,7 @@
 public:
   void start_bulk_insert(drizzled::ha_rows rows);
   int end_bulk_insert();
-  enum drizzled::row_type get_row_type() const
-  {
-    return drizzled::ROW_TYPE_COMPRESSED;
-  }
+
   drizzled::THR_LOCK_DATA **store_lock(drizzled::Session *session,
                                        drizzled::THR_LOCK_DATA **to,
                                        drizzled::thr_lock_type lock_type);
 
=== modified file 'plugin/heap/ha_heap.cc'
--- plugin/heap/ha_heap.cc	2010-07-16 05:40:08 +0000
+++ plugin/heap/ha_heap.cc	2010-07-27 23:22:44 +0000
@@ -501,15 +501,6 @@
   return 0;
 }
 
-
-enum row_type ha_heap::get_row_type() const
-{
-  if (file->s->recordspace.is_variable_size)
-    return ROW_TYPE_DYNAMIC;
-
-  return ROW_TYPE_FIXED;
-}
-
 int ha_heap::extra(enum ha_extra_function operation)
 {
   return heap_extra(file,operation);
@@ -880,7 +871,7 @@
   hp_create_info.with_auto_increment= found_real_auto_increment;
   hp_create_info.internal_table= internal_table;
   hp_create_info.max_chunk_size= table_arg->getShare()->block_size;
-  hp_create_info.is_dynamic= (table_arg->getShare()->row_type == ROW_TYPE_DYNAMIC);
+  hp_create_info.is_dynamic= false;
 
   error= heap_create(internal::fn_format(buff,table_name,"","",
                               MY_REPLACE_EXT|MY_UNPACK_FILENAME),
 
=== modified file 'plugin/heap/ha_heap.h'
--- plugin/heap/ha_heap.h	2010-04-23 17:43:11 +0000
+++ plugin/heap/ha_heap.h	2010-07-27 23:22:44 +0000
@@ -41,7 +41,7 @@
   Cursor *clone(drizzled::memory::Root *mem_root);
 
   const char *index_type(uint32_t inx);
-  drizzled::row_type get_row_type() const;
+
   const drizzled::key_map *keys_to_use_for_scanning() { return &btree_keys; }
   double scan_time()
   { return (double) (stats.records+stats.deleted) / 20.0+10; }
 
=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2010-07-20 17:46:20 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2010-07-27 23:22:44 +0000
@@ -2517,43 +2517,6 @@
 *****************************************************************************/
 
 /****************************************************************//**
-Get the record format from the data dictionary.
-@return one of ROW_TYPE_REDUNDANT, ROW_TYPE_COMPACT,
-ROW_TYPE_COMPRESSED, ROW_TYPE_DYNAMIC */
-UNIV_INTERN
-enum row_type
-ha_innobase::get_row_type() const
-/*=============================*/
-{
-  if (prebuilt && prebuilt->table) {
-    const ulint flags = prebuilt->table->flags;
-
-    if (UNIV_UNLIKELY(!flags)) {
-      return(ROW_TYPE_REDUNDANT);
-    }
-
-    ut_ad(flags & DICT_TF_COMPACT);
-
-    switch (flags & DICT_TF_FORMAT_MASK) {
-    case DICT_TF_FORMAT_51 << DICT_TF_FORMAT_SHIFT:
-      return(ROW_TYPE_COMPACT);
-    case DICT_TF_FORMAT_ZIP << DICT_TF_FORMAT_SHIFT:
-      if (flags & DICT_TF_ZSSIZE_MASK) {
-        return(ROW_TYPE_COMPRESSED);
-      } else {
-        return(ROW_TYPE_DYNAMIC);
-      }
-#if DICT_TF_FORMAT_ZIP != DICT_TF_FORMAT_MAX
-# error "DICT_TF_FORMAT_ZIP != DICT_TF_FORMAT_MAX"
-#endif
-    }
-  }
-  ut_ad(0);
-  return(ROW_TYPE_NOT_USED);
-}
-
-
-/****************************************************************//**
 Returns the index type. */
 UNIV_INTERN
 const char*
 
=== modified file 'plugin/innobase/handler/ha_innodb.h'
--- plugin/innobase/handler/ha_innodb.h	2010-06-21 16:57:08 +0000
+++ plugin/innobase/handler/ha_innodb.h	2010-07-27 23:22:44 +0000
@@ -115,12 +115,6 @@
     return static_cast<plugin::TransactionalStorageEngine *>(engine);
   }
 
-	/*
-	  Get the row type from the storage engine.  If this method returns
-	  ROW_TYPE_NOT_USED, the information in HA_CREATE_INFO should be used.
-	*/
-	UNIV_INTERN enum row_type get_row_type() const;
-
 	UNIV_INTERN const char* index_type(uint key_number);
 	UNIV_INTERN const key_map* keys_to_use_for_scanning();
 
 
=== added file 'plugin/pbms/src/pbmslib.h'
--- plugin/pbms/src/pbmslib.h	1970-01-01 00:00:00 +0000
+++ plugin/pbms/src/pbmslib.h	2010-07-15 17:00:55 +0000
@@ -0,0 +1,119 @@
+/* Copyright (c) 2008 PrimeBase Technologies GmbH, Germany
+ *
+ *  PrimeBase Media Stream (PBMS)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 2008-09-10	Barry Leslie
+ *
+ * H&G2JCtL
+ */
+#ifndef __PBMSLIB_H__
+#define __PBMSLIB_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MS_STANDARD_STORAGE		0	// BLOB data is stored in the repository.
+#define MS_CLOUD_STORAGE		1	// BLOB data is in S3 cloud storage.
+
+/*<DRIZZLE>*/
+#define MS_CHECKSUM_TAG       "PBMS_CHECKSUM"
+#define MS_ALIAS_TAG          "PBMS_BLOB_ALIAS"
+#define MS_BLOB_INFO_REQUEST	"PBMS_RETURN_HEADER_ONLY"
+#define MS_PING_REQUEST       "PBMS_PING_CONNECTION"
+#define MS_BLOB_SIZE          "PBMS_BLOB_SIZE"
+#define MS_LAST_ACCESS        "PBMS_LAST_ACCESS"
+#define MS_ACCESS_COUNT       "PBMS_ACCESS_COUNT"
+#define MS_CREATION_TIME      "PBMS_CREATION_TIME"
+#define MS_BLOB_TYPE          "PBMS_BLOB_TYPE"
+
+#define MS_REQUEST_SIZE       "PBMS_REQUEST_SIZE"     // The number of bytes of BLOB data the client requests.
+#define MS_REQUEST_OFFSET     "PBMS_REQUEST_OFFSET"   // The offset into the BLOB that the client requests the data from.
+
+#define MS_CLOUD_SERVER       "PBMS_CLOUD_SERVER"
+#define MS_CLOUD_BUCKET       "PBMS_CLOUD_BUCKET"
+#define MS_CLOUD_OBJECT_KEY		"PBMS_CLOUD_OBJECT_KEY"
+#define MS_CLOUD_KEY          "PBMS_CLOUD_KEY"
+#define MS_BLOB_SIGNATURE     "PBMS_BLOB_SIGNATURE"
+#define MS_BLOB_DATE          "PBMS_BLOB_DATE"	// The date used when creating the signature.
+
+#define MS_META_NAME_SIZE		32
+#define MS_META_VALUE_SIZE		1024
+#define MS_BLOB_ALIAS_SIZE		MS_META_VALUE_SIZE
+#define MS_BLOB_URL_SIZE		200
+
+#ifndef PBMS_PORT
+#define DEFAULT_PBMS_PORT 8080
+#else
+#define DEFAULT_PBMS_PORT PBMS_PORT
+#endif
+
+/* PBMS handle types. */
+typedef void *PBMS;				// A connection handle.
+
+typedef unsigned char pbms_bool;
+
+/* options for pbms_set_option() and pbms_get_option() */
+enum pbms_option						/*: Parameter type	|	Information																										*/
+{
+  PBMS_OPTION_KEEP_ALIVE,				/*: unsigned int*	|	A boolean value indicating if the keep_alive flag should be set on HTTP requests.(Defalt = false)	*/
+  PBMS_OPTION_TRANSMITION_TIMEOUT,		/*: unsigned int*	|	If greater than zero this sets a limit to how long a blob transfer can take.  (Defalt = 0)						*/
+  PBMS_OPTION_HOST,						/*: (const char *)*	|	The connection's Media Stream server host IP address. (Read Only)												*/
+  PBMS_OPTION_PORT,						/*: unsigned int*	|	The connection's Media Stream server host port number. (Read Only)												*/
+  PBMS_OPTION_DATABASE					/*: (const char *)*	|	The connection's associated database.																			*/
+};
+
+typedef size_t (* PBMS_READ_CALLBACK_FUNC) (void *caller_data, char *buffer, size_t size, pbms_bool reset);
+typedef size_t (* PBMS_WRITE_CALLBACK_FUNC) (void *caller_data, const char *buffer, size_t size, pbms_bool reset);
+
+pbms_bool pbms_library_init();
+void	pbms_library_end();
+PBMS pbms_connect(const char* host, unsigned int port, const char *database);
+
+
+void pbms_close(PBMS pbms);
+pbms_bool pbms_set_option(PBMS pbms, enum pbms_option option, const void *in_value);
+pbms_bool pbms_get_option(PBMS pbms, enum pbms_option option, void *out_value);
+int pbms_errno(PBMS pbms);
+const char *pbms_error(PBMS pbms);
+pbms_bool pbms_is_blob_reference(PBMS pbms, const char *ref);
+pbms_bool pbms_get_blob_size(PBMS pbms, const char *ref, size_t *size);
+
+/* Metadata related functions. */
+pbms_bool pbms_add_metadata(PBMS pbms, const char *name, const char *value);
+void pbms_clear_metadata(PBMS pbms, const char *name);	//If name is NULL all metadata associaed with the connection is removed.
+unsigned int pbms_reset_metadata(PBMS pbms);			//Resets the metadata cursor for downloaded metadata.
+pbms_bool pbms_next_metadata(PBMS pbms, char *name, char *value, size_t *v_size);
+pbms_bool pbms_get_metadata_value(PBMS pbms, const char *name, char *buffer, size_t *size);
+
+pbms_bool pbms_get_md5_digest(PBMS pbms, char *md5_digest); 
+
+pbms_bool pbms_put_data(PBMS pbms, const char *table, const char *checksum, char *ref, size_t size, const unsigned char *buffer);
+pbms_bool pbms_put_data_cb(PBMS pbms, const char *table, const char *checksum, char *ref, size_t size, PBMS_READ_CALLBACK_FUNC cb, void *caller_data);
+
+pbms_bool pbms_get_data(PBMS pbms, const char *ref, unsigned char *buffer, size_t buffer_size);
+pbms_bool pbms_get_data_cb(PBMS pbms, const char *ref, PBMS_WRITE_CALLBACK_FUNC cb, void *caller_data);
+
+pbms_bool pbms_get_data_range(PBMS pbms, const char *ref, size_t start_offset, size_t end_offset, unsigned char *buffer, size_t buffer_size, size_t *data_size);
+pbms_bool pbms_get_data_range_cb(PBMS pbms, const char *ref, size_t start_offset, size_t end_offset, PBMS_WRITE_CALLBACK_FUNC cb, void *caller_data);
+
+pbms_bool pbms_get_info(PBMS pbms, const char *ref);
+
+#ifdef __cplusplus
+}
+#endif
+#endif // __PBMSLIB_H__
 
=== modified file 'plugin/schema_dictionary/tables.cc'
--- plugin/schema_dictionary/tables.cc	2010-07-15 23:18:11 +0000
+++ plugin/schema_dictionary/tables.cc	2010-07-27 23:22:44 +0000
@@ -30,13 +30,6 @@
 static const string INTERNAL("INTERNAL");
 static const string FUNCTION("FUNCTION");
 
-static const string DEFAULT("DEFAULT");
-static const string FIXED("FIXED");
-static const string DYNAMIC("DYNAMIC");
-static const string COMPRESSED("COMPRESSED");
-static const string REDUNDANT("REDUNDANT");
-static const string COMPACT("COMPACT");
-static const string PAGE("PAGE");
 
 static const string VARCHAR("VARCHAR");
 static const string DOUBLE("DOUBLE");
@@ -92,35 +85,6 @@
   return false;
 }
 
-void TablesTool::Generator::pushRow(message::Table::TableOptions::RowType type)
-{
-  switch (type)
-  {
-  default:
-  case message::Table::TableOptions::ROW_TYPE_DEFAULT:
-    push(DEFAULT);
-    break;
-  case message::Table::TableOptions::ROW_TYPE_FIXED:
-    push(FIXED);
-    break;
-  case message::Table::TableOptions::ROW_TYPE_DYNAMIC:
-    push(DYNAMIC);
-    break;
-  case message::Table::TableOptions::ROW_TYPE_COMPRESSED:
-    push(COMPRESSED);
-    break;
-  case message::Table::TableOptions::ROW_TYPE_REDUNDANT:
-    push(REDUNDANT);
-    break;
-  case message::Table::TableOptions::ROW_TYPE_COMPACT:
-    push(COMPACT);
-    break;
-  case message::Table::TableOptions::ROW_TYPE_PAGE:
-    push(PAGE);
-    break;
-  }
-}
-
 void TablesTool::Generator::pushType(message::Table::Field::FieldType type)
 {
   switch (type)
@@ -196,7 +160,7 @@
   push(getTableMessage().engine().name());
 
   /* ROW_FORMAT */
-  pushRow(getTableMessage().options().row_type());
+  push("DEFAULT");
 
   /* TABLE_COLLATION */
   push(getTableMessage().options().collation());
 
=== modified file 'plugin/schema_dictionary/tables.h'
--- plugin/schema_dictionary/tables.h	2010-07-06 23:50:55 +0000
+++ plugin/schema_dictionary/tables.h	2010-07-27 23:22:44 +0000
@@ -47,7 +47,6 @@
 
     bool nextTable();
 
-    void pushRow(drizzled::message::Table::TableOptions::RowType type);
     void pushType(drizzled::message::Table::Field::FieldType type);
 
     const std::string &table_name()