Merge lp:~stewart/drizzle/show-create-table-using-table-message into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

This does three things:
1) fix up all the code locations for putting foreign keys in the table proto
2) have the SHOW CREATE TABLE code use statement_transform from the table message
3) innobase plugin now uses statement transform to get a SQL statement for its parser instead of mysql_query_str for SQLCOM_CREATE_TABLE

oh, and a bunch of bug fixes along the way.

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

Apologies for the giant patch.

[Brian Aker (brianaker)]

Can you flip these around:

destination.append(" date", 5);

Standard requires them to be upper case.

We are also ending up with more spaces in output (which is causing some of the issues with changed tests).

review: Needs Fixing

[Stewart Smith (stewart)]

mainly on the transaction_log tests, which were different to begin with.

as to the upper case, I wanted to first do an iteration where it was just (as close as possible) replace old SHOW CREATE TABLE with this.

I'd like the next tree to be "make SHOW CREATE TABLE output as standard as possible"... where the change will just be small things such as this, rather than also the code changes

[Brian Aker (brianaker)]

We need to file bugs on:
1) Explicit display of collation on varchar.
2) Upper case the type.

Otherwise, all good.

review: Approve

[Stewart Smith (stewart)]

done:
https://bugs.launchpad.net/drizzle/+bug/619590
and
https://bugs.launchpad.net/drizzle/+bug/619591

=== modified file 'drizzled/alter_drop.h'
--- drizzled/alter_drop.h	2010-02-04 08:14:46 +0000
+++ drizzled/alter_drop.h	2010-08-17 22:51:53 +0000
@@ -34,7 +34,8 @@
   enum drop_type
   {
     KEY,
-    COLUMN
+    COLUMN,
+    FOREIGN_KEY
   };
   const char *name;
   enum drop_type type;

=== modified file 'drizzled/create_field.cc'
--- drizzled/create_field.cc	2010-07-30 20:31:19 +0000
+++ drizzled/create_field.cc	2010-08-17 22:51:53 +0000
@@ -94,7 +94,8 @@
   def= 0;
   char_length= length;
 
-  if (!(flags & (NO_DEFAULT_VALUE_FLAG )) &&
+  if (!(flags & (NO_DEFAULT_VALUE_FLAG)) &&
+      !(flags & AUTO_INCREMENT_FLAG) &&
       old_field->ptr && orig_field &&
       (sql_type != DRIZZLE_TYPE_TIMESTAMP ||                /* set def only if */
        old_field->getTable()->timestamp_field != old_field ||  /* timestamp field */

=== modified file 'drizzled/foreign_key.cc'
--- drizzled/foreign_key.cc	2010-02-04 08:14:46 +0000
+++ drizzled/foreign_key.cc	2010-08-17 22:51:53 +0000
@@ -25,12 +25,59 @@
 #include "drizzled/error.h"
 #include "drizzled/create_field.h"
 #include "drizzled/internal/my_sys.h"
+#include "drizzled/table_ident.h"
 
 namespace drizzled
 {
 
 extern const CHARSET_INFO *system_charset_info;
 
+void add_foreign_key_to_table_message(
+    message::Table *table_message,
+    const char* fkey_name,
+    List<Key_part_spec> &cols,
+    Table_ident *table,
+    List<Key_part_spec> &ref_cols,
+    message::Table::ForeignKeyConstraint::ForeignKeyOption delete_opt_arg,
+    message::Table::ForeignKeyConstraint::ForeignKeyOption update_opt_arg,
+    message::Table::ForeignKeyConstraint::ForeignKeyMatchOption match_opt_arg)
+{
+  message::Table::ForeignKeyConstraint *pfkey= table_message->add_fk_constraint();
+  if (fkey_name)
+    pfkey->set_name(fkey_name);
+  else if (table_message->has_name())
+  {
+    std::string name(table_message->name());
+    char number[20];
+
+    name.append("_ibfk_");
+    snprintf(number, sizeof(number), "%d", table_message->fk_constraint_size());
+    name.append(number);
+
+    pfkey->set_name(name);
+  }
+
+  pfkey->set_match(match_opt_arg);
+  pfkey->set_update_option(update_opt_arg);
+  pfkey->set_delete_option(delete_opt_arg);
+
+  pfkey->set_references_table_name(table->table.str);
+
+  Key_part_spec *keypart;
+  List_iterator<Key_part_spec> col_it(cols);
+  while ((keypart= col_it++))
+  {
+    pfkey->add_column_names(keypart->field_name.str);
+  }
+
+  List_iterator<Key_part_spec> ref_it(ref_cols);
+  while ((keypart= ref_it++))
+  {
+    pfkey->add_references_columns(keypart->field_name.str);
+  }
+
+}
+
 Foreign_key::Foreign_key(const Foreign_key &rhs, memory::Root *mem_root)
   :Key(rhs),
   ref_table(rhs.ref_table),

=== modified file 'drizzled/foreign_key.h'
--- drizzled/foreign_key.h	2010-07-13 01:12:39 +0000
+++ drizzled/foreign_key.h	2010-08-17 22:51:53 +0000
@@ -36,6 +36,17 @@
 
 namespace memory { class Root; }
 
+void add_foreign_key_to_table_message(
+    message::Table *table_message,
+    const char* fkey_name,
+    List<Key_part_spec> &cols,
+    Table_ident *table,
+    List<Key_part_spec> &ref_cols,
+    message::Table::ForeignKeyConstraint::ForeignKeyOption delete_opt_arg,
+    message::Table::ForeignKeyConstraint::ForeignKeyOption update_opt_arg,
+    message::Table::ForeignKeyConstraint::ForeignKeyMatchOption match_opt_arg);
+
+
 class Foreign_key: public Key 
 {
 public:

=== modified file 'drizzled/message/statement_transform.cc'
--- drizzled/message/statement_transform.cc	2010-07-29 15:50:19 +0000
+++ drizzled/message/statement_transform.cc	2010-08-17 22:51:53 +0000
@@ -916,14 +916,10 @@
   destination.append("TABLE ", 6);
   if (with_schema)
   {
-    destination.push_back(quoted_identifier);
-    destination.append(table.schema());
-    destination.push_back(quoted_identifier);
+    append_escaped_string(&destination, table.schema(), quoted_identifier);
     destination.push_back('.');
   }
-  destination.push_back(quoted_identifier);
-  destination.append(table.name());
-  destination.push_back(quoted_identifier);
+  append_escaped_string(&destination, table.name(), quoted_identifier);
   destination.append(" (\n", 3);
 
   enum TransformSqlError result= NONE;
@@ -935,8 +931,10 @@
     if (x != 0)
       destination.append(",\n", 2);
 
+    destination.append("  ");
+
     result= transformFieldDefinitionToSql(field, destination, sql_variant);
-    
+
     if (result != NONE)
       return result;
   }
@@ -982,18 +980,21 @@
   /* Add ENGINE = " clause */
   if (table.has_engine())
   {
-    destination.append("\nENGINE = ", 10);
+    destination.append(" ENGINE=", 8);
     destination.append(table.engine().name());
 
     size_t num_engine_options= table.engine().options_size();
+    if (num_engine_options > 0)
+      destination.append(" ", 1);
     for (size_t x= 0; x < num_engine_options; ++x)
     {
       const Engine::Option &option= table.engine().options(x);
-      destination.push_back('\n');
       destination.append(option.name());
-      destination.append(" = ", 3);
+      destination.append("='", 2);
       destination.append(option.state());
-      destination.push_back('\n');
+      destination.append("'", 1);
+      if(x != num_engine_options-1)
+        destination.append(", ", 2);
     }
   }
 
@@ -1015,25 +1016,16 @@
 
   if (options.has_comment())
   {
-    destination.append("\nCOMMENT = '", 12);
-    destination.append(options.comment());
-    destination.push_back('\'');
+    destination.append(" COMMENT=", 9);
+    append_escaped_string(&destination, options.comment());
   }
 
   if (options.has_collation())
   {
-    destination.append("\nCOLLATE = ", 11);
+    destination.append(" COLLATE = ", 11);
     destination.append(options.collation());
   }
 
-  if (options.has_auto_increment())
-  {
-    ss << options.auto_increment();
-    destination.append("\nAUTOINCREMENT_OFFSET = ", 24);
-    destination.append(ss.str());
-    ss.clear();
-  }
-
   if (options.has_data_file_name())
   {
     destination.append("\nDATA_FILE_NAME = '", 19);
@@ -1064,10 +1056,11 @@
     ss.clear();
   }
 
-  if (options.has_auto_increment_value())
+  if (options.has_user_set_auto_increment_value()
+      && options.has_auto_increment_value())
   {
     ss << options.auto_increment_value();
-    destination.append("\nAUTO_INCREMENT = ", 18);
+    destination.append(" AUTO_INCREMENT=", 16);
     destination.append(ss.str());
     ss.clear();
   }
@@ -1100,17 +1093,24 @@
   if (sql_variant == ANSI)
     quoted_identifier= '"';
 
+  destination.append("  ", 2);
+
   if (index.is_primary())
     destination.append("PRIMARY ", 8);
   else if (index.is_unique())
     destination.append("UNIQUE ", 7);
 
   destination.append("KEY ", 4);
-  destination.push_back(quoted_identifier);
-  destination.append(index.name());
-  destination.push_back(quoted_identifier);
-  destination.append(" (", 2);
-  
+  if (! (index.is_primary() && index.name().compare("PRIMARY")==0))
+  {
+    destination.push_back(quoted_identifier);
+    destination.append(index.name());
+    destination.push_back(quoted_identifier);
+    destination.append(" (", 2);
+  }
+  else
+    destination.append("(", 1);
+
   size_t num_parts= index.index_part_size();
   for (size_t x= 0; x < num_parts; ++x)
   {
@@ -1147,6 +1147,30 @@
   }
   destination.push_back(')');
 
+  switch (index.type())
+  {
+  case Table::Index::UNKNOWN_INDEX:
+    break;
+  case Table::Index::BTREE:
+    destination.append(" USING BTREE", 12);
+    break;
+  case Table::Index::RTREE:
+    destination.append(" USING RTREE", 12);
+    break;
+  case Table::Index::HASH:
+    destination.append(" USING HASH", 11);
+    break;
+  case Table::Index::FULLTEXT:
+    destination.append(" USING FULLTEXT", 15);
+    break;
+  }
+
+  if (index.has_comment())
+  {
+    destination.append(" COMMENT ", 9);
+    append_escaped_string(&destination, index.comment());
+  }
+
   return NONE;
 }
 
@@ -1198,7 +1222,7 @@
   for (ssize_t x= 0; x < fkey.column_names_size(); ++x)
   {
     if (x != 0)
-      destination.push_back(',');
+      destination.append(", ");
 
     append_escaped_string(&destination, fkey.column_names(x),
                           quoted_identifier);
@@ -1213,7 +1237,7 @@
   for (ssize_t x= 0; x < fkey.references_columns_size(); ++x)
   {
     if (x != 0)
-      destination.push_back(',');
+      destination.append(", ");
 
     append_escaped_string(&destination, fkey.references_columns(x),
                           quoted_identifier);
@@ -1242,35 +1266,59 @@
                               enum TransformSqlVariant sql_variant)
 {
   char quoted_identifier= '`';
+  char quoted_default;
+
   if (sql_variant == ANSI)
     quoted_identifier= '"';
 
-  destination.push_back(quoted_identifier);
-  destination.append(field.name());
-  destination.push_back(quoted_identifier);
+  if (sql_variant == DRIZZLE)
+    quoted_default= '\'';
+  else
+    quoted_default= quoted_identifier;
+
+  append_escaped_string(&destination, field.name(), quoted_identifier);
 
   Table::Field::FieldType field_type= field.type();
 
   switch (field_type)
   {
     case Table::Field::DOUBLE:
-    destination.append(" DOUBLE", 7);
+    destination.append(" double", 7);
+    if (field.has_numeric_options()
+        && field.numeric_options().has_precision())
+    {
+      stringstream ss;
+      ss << "(" << field.numeric_options().precision() << ",";
+      ss << field.numeric_options().scale() << ")";
+      destination.append(ss.str());
+    }
     break;
   case Table::Field::VARCHAR:
     {
-      destination.append(" VARCHAR(", 9);
+      if (field.string_options().has_collation()
+          && field.string_options().collation().compare("binary") == 0)
+        destination.append(" varbinary(", 11);
+      else
+        destination.append(" varchar(", 9);
+
       stringstream ss;
       ss << field.string_options().length() << ")";
       destination.append(ss.str());
     }
     break;
   case Table::Field::BLOB:
-    destination.append(" BLOB", 5);
+    {
+      if (field.string_options().has_collation()
+          && field.string_options().collation().compare("binary") == 0)
+        destination.append(" blob", 5);
+      else
+        destination.append(" text", 5);
+    }
     break;
   case Table::Field::ENUM:
     {
       size_t num_field_values= field.enumeration_values().field_value_size();
-      destination.append(" ENUM(", 6);
+      destination.append(" enum(", 6);
       for (size_t x= 0; x < num_field_values; ++x)
       {
         const string &type= field.enumeration_values().field_value(x);
@@ -1286,14 +1334,14 @@
       break;
     }
   case Table::Field::INTEGER:
-    destination.append(" INT", 4);
+    destination.append(" int", 4);
     break;
   case Table::Field::BIGINT:
-    destination.append(" BIGINT", 7);
+    destination.append(" bigint", 7);
     break;
   case Table::Field::DECIMAL:
     {
-      destination.append(" DECIMAL(", 9);
+      destination.append(" decimal(", 9);
       stringstream ss;
       ss << field.numeric_options().precision() << ",";
       ss << field.numeric_options().scale() << ")";
@@ -1301,13 +1349,13 @@
     }
     break;
   case Table::Field::DATE:
-    destination.append(" DATE", 5);
+    destination.append(" date", 5);
     break;
   case Table::Field::TIMESTAMP:
-    destination.append(" TIMESTAMP",  10);
+    destination.append(" timestamp",  10);
     break;
   case Table::Field::DATETIME:
-    destination.append(" DATETIME",  9);
+    destination.append(" datetime",  9);
     break;
   }
 
@@ -1322,13 +1370,25 @@
     }
   }
 
+  if (field.type() == Table::Field::BLOB ||
+      field.type() == Table::Field::VARCHAR)
+  {
+    if (field.string_options().has_collation()
+        && (field.string_options().collation().compare("binary")
+            && field.string_options().collation().compare("utf8_general_ci")))
+    {
+      destination.append(" COLLATE ", 9);
+      destination.append(field.string_options().collation());
+    }
+  }
 
-  if (! (field.has_constraints() &&
-         field.constraints().is_nullable()))
+  if (field.has_constraints() &&
+      ! field.constraints().is_nullable())
   {
-    destination.append(" NOT", 4);
+    destination.append(" NOT NULL", 9);
   }
-  destination.append(" NULL", 5);
+  else if (field.type() == Table::Field::TIMESTAMP)
+    destination.append(" NULL", 5);
 
   if (field.type() == Table::Field::INTEGER || 
       field.type() == Table::Field::BIGINT)
@@ -1341,46 +1401,49 @@
     }
   }
 
-  if (field.type() == Table::Field::BLOB ||
-      field.type() == Table::Field::VARCHAR)
-  {
-    if (field.string_options().has_collation())
-    {
-      destination.append(" COLLATE ", 9);
-      destination.append(field.string_options().collation());
-    }
-  }
-
   if (field.options().has_default_value())
   {
     destination.append(" DEFAULT ", 9);
-    destination.push_back(quoted_identifier);
-    destination.append(field.options().default_value());
-    destination.push_back(quoted_identifier);
-  }
-
-  if (field.options().has_default_bin_value())
+    append_escaped_string(&destination, field.options().default_value());
+  }
+  else if (field.options().has_default_expression())
+  {
+    destination.append(" DEFAULT ", 9);
+    destination.append(field.options().default_expression());
+  }
+  else if (field.options().has_default_bin_value())
   {
     const string &v= field.options().default_bin_value();
-    destination.append(" DEFAULT 0x", 11);
-    for (size_t x= 0; x < v.length(); x++)
+    if (v.length() == 0)
+      destination.append(" DEFAULT ''", 11);
+    else
     {
-      printf("%.2x", *(v.c_str() + x));
+      destination.append(" DEFAULT 0x", 11);
+      for (size_t x= 0; x < v.length(); x++)
+      {
+        char hex[3];
+        snprintf(hex, sizeof(hex), "%.2X", *(v.c_str() + x));
+        destination.append(hex, 2);
+      }
     }
   }
+  else if (field.options().has_default_null()
+           && field.options().default_null()
+           && field.type() != Table::Field::BLOB)
+  {
+    destination.append(" DEFAULT NULL", 13);
+  }
 
-  if (field.has_options() && field.options().has_update_value())
+  if (field.has_options() && field.options().has_update_expression())
   {
     destination.append(" ON UPDATE ", 11);
-    destination.append(field.options().update_value());
+    destination.append(field.options().update_expression());
   }
 
   if (field.has_comment())
   {
     destination.append(" COMMENT ", 9);
-    destination.push_back(quoted_identifier);
-    destination.append(field.comment());
-    destination.push_back(quoted_identifier);
+    append_escaped_string(&destination, field.comment(), quoted_default);
   }
   return NONE;
 }

=== modified file 'drizzled/message/table.proto'
--- drizzled/message/table.proto	2010-07-30 19:22:04 +0000
+++ drizzled/message/table.proto	2010-08-17 22:51:53 +0000
@@ -16,7 +16,7 @@
   }
 
   message TableOptions {
-    optional uint64 auto_increment = 1;
+    optional bool has_user_set_auto_increment_value = 1;
     optional string collation = 2;
     optional uint32 collation_id = 3;
     optional string data_file_name = 5;

=== modified file 'drizzled/show.cc'
--- drizzled/show.cc	2010-07-29 02:31:37 +0000
+++ drizzled/show.cc	2010-08-17 22:51:53 +0000
@@ -48,6 +48,8 @@
 #include "drizzled/pthread_globals.h"
 #include "drizzled/internal/m_string.h"
 #include "drizzled/internal/my_sys.h"
+#include "drizzled/message/statement_transform.h"
+
 
 #include <sys/stat.h>
 
@@ -68,9 +70,6 @@
   return str ? str : "<nil>";
 }
 
-static void store_key_options(String *packet, Table *table, KeyInfo *key_info);
-
-
 int wild_case_compare(const CHARSET_INFO * const cs, const char *str, const char *wildstr)
 {
   register int flag;
@@ -287,57 +286,6 @@
 
 #define LIST_PROCESS_HOST_LEN 64
 
-static bool get_field_default_value(Field *timestamp_field,
-                                    Field *field, String *def_value,
-                                    bool quoted)
-{
-  bool has_default;
-  bool has_now_default;
-
-  /*
-     We are using CURRENT_TIMESTAMP instead of NOW because it is
-     more standard
-  */
-  has_now_default= (timestamp_field == field &&
-                    field->unireg_check != Field::TIMESTAMP_UN_FIELD);
-
-  has_default= (field->type() != DRIZZLE_TYPE_BLOB &&
-                !(field->flags & NO_DEFAULT_VALUE_FLAG) &&
-                field->unireg_check != Field::NEXT_NUMBER);
-
-  def_value->length(0);
-  if (has_default)
-  {
-    if (has_now_default)
-      def_value->append(STRING_WITH_LEN("CURRENT_TIMESTAMP"));
-    else if (!field->is_null())
-    {                                             // Not null by default
-      char tmp[MAX_FIELD_WIDTH];
-      String type(tmp, sizeof(tmp), field->charset());
-      field->val_str(&type);
-      if (type.length())
-      {
-        String def_val;
-        uint32_t dummy_errors;
-        /* convert to system_charset_info == utf8 */
-        def_val.copy(type.ptr(), type.length(), field->charset(),
-                     system_charset_info, &dummy_errors);
-        if (quoted)
-          append_unescaped(def_value, def_val.ptr(), def_val.length());
-        else
-          def_value->append(def_val.ptr(), def_val.length());
-      }
-      else if (quoted)
-        def_value->append(STRING_WITH_LEN("''"));
-    }
-    else if (field->maybe_null() && quoted)
-      def_value->append(STRING_WITH_LEN("NULL"));    // Null as default
-    else
-      return false;
-  }
-  return has_default;
-}
-
 /*
   Build a CREATE TABLE statement for a table.
 
@@ -358,243 +306,26 @@
 
 int store_create_info(TableList *table_list, String *packet, bool is_if_not_exists)
 {
-  List<Item> field_list;
-  char tmp[MAX_FIELD_WIDTH], *for_str, def_value_buf[MAX_FIELD_WIDTH];
-  const char *alias;
-  string buff;
-  String type(tmp, sizeof(tmp), system_charset_info);
-  String def_value(def_value_buf, sizeof(def_value_buf), system_charset_info);
-  Field **ptr,*field;
-  uint32_t primary_key;
-  KeyInfo *key_info;
   Table *table= table_list->table;
-  Cursor *cursor= table->cursor;
-  HA_CREATE_INFO create_info;
-  my_bitmap_map *old_map;
 
   table->restoreRecordAsDefault(); // Get empty record
 
-  if (table->getShare()->getType())
-    packet->append(STRING_WITH_LEN("CREATE TEMPORARY TABLE "));
-  else
-    packet->append(STRING_WITH_LEN("CREATE TABLE "));
-  if (is_if_not_exists)
-    packet->append(STRING_WITH_LEN("IF NOT EXISTS "));
-  alias= table->getShare()->getTableName();
-
-  packet->append_identifier(alias, strlen(alias));
-  packet->append(STRING_WITH_LEN(" (\n"));
-  /*
-    We need this to get default values from the table
-    We have to restore the read_set if we are called from insert in case
-    of row based replication.
-  */
-  old_map= table->use_all_columns(table->read_set);
-
-  for (ptr= table->getFields() ; (field= *ptr); ptr++)
-  {
-    uint32_t flags = field->flags;
-
-    if (ptr != table->getFields())
-      packet->append(STRING_WITH_LEN(",\n"));
-
-    packet->append(STRING_WITH_LEN("  "));
-    packet->append_identifier(field->field_name, strlen(field->field_name));
-    packet->append(' ');
-    // check for surprises from the previous call to Field::sql_type()
-    if (type.ptr() != tmp)
-      type.set(tmp, sizeof(tmp), system_charset_info);
-    else
-      type.set_charset(system_charset_info);
-
-    field->sql_type(type);
-    packet->append(type.ptr(), type.length(), system_charset_info);
-
-    if (field->has_charset())
-    {
-      /*
-        For string types dump collation name only if
-        collation is not primary for the given charset
-      */
-      if (!(field->charset()->state & MY_CS_PRIMARY))
-      {
-        packet->append(STRING_WITH_LEN(" COLLATE "));
-        packet->append(field->charset()->name);
-      }
-    }
-
-    if (flags & NOT_NULL_FLAG)
-      packet->append(STRING_WITH_LEN(" NOT NULL"));
-    else if (field->type() == DRIZZLE_TYPE_TIMESTAMP)
-    {
-      /*
-        TIMESTAMP field require explicit NULL flag, because unlike
-        all other fields they are treated as NOT NULL by default.
-      */
-      packet->append(STRING_WITH_LEN(" NULL"));
-    }
-    {
-      /*
-        Add field flags about FIELD FORMAT (FIXED or DYNAMIC)
-        and about STORAGE (DISK or MEMORY).
-      */
-      enum column_format_type column_format= (enum column_format_type)
-        ((flags >> COLUMN_FORMAT_FLAGS) & COLUMN_FORMAT_MASK);
-      if (column_format)
-      {
-        packet->append(STRING_WITH_LEN(" /*!"));
-        packet->append(STRING_WITH_LEN(" COLUMN_FORMAT"));
-        if (column_format == COLUMN_FORMAT_TYPE_FIXED)
-          packet->append(STRING_WITH_LEN(" FIXED */"));
-        else
-          packet->append(STRING_WITH_LEN(" DYNAMIC */"));
-      }
-    }
-    if (get_field_default_value(table->timestamp_field, field, &def_value, 1))
-    {
-      packet->append(STRING_WITH_LEN(" DEFAULT "));
-      packet->append(def_value.ptr(), def_value.length(), system_charset_info);
-    }
-
-    if (table->timestamp_field == field && field->unireg_check != Field::TIMESTAMP_DN_FIELD)
-      packet->append(STRING_WITH_LEN(" ON UPDATE CURRENT_TIMESTAMP"));
-
-    if (field->unireg_check == Field::NEXT_NUMBER)
-      packet->append(STRING_WITH_LEN(" AUTO_INCREMENT"));
-
-    if (field->comment.length)
-    {
-      packet->append(STRING_WITH_LEN(" COMMENT "));
-      append_unescaped(packet, field->comment.str, field->comment.length);
-    }
-  }
-
-  key_info= table->key_info;
-  memset(&create_info, 0, sizeof(create_info));
-
-  primary_key= table->getShare()->getPrimaryKey();
-
-  for (uint32_t i=0 ; i < table->getShare()->sizeKeys() ; i++,key_info++)
-  {
-    KeyPartInfo *key_part= key_info->key_part;
-    bool found_primary=0;
-    packet->append(STRING_WITH_LEN(",\n  "));
-
-    if (i == primary_key && is_primary_key(key_info))
-    {
-      found_primary=1;
-      /*
-        No space at end, because a space will be added after where the
-        identifier would go, but that is not added for primary key.
-      */
-      packet->append(STRING_WITH_LEN("PRIMARY KEY"));
-    }
-    else if (key_info->flags & HA_NOSAME)
-      packet->append(STRING_WITH_LEN("UNIQUE KEY "));
-    else
-      packet->append(STRING_WITH_LEN("KEY "));
-
-    if (!found_primary)
-     packet->append_identifier(key_info->name, strlen(key_info->name));
-
-    packet->append(STRING_WITH_LEN(" ("));
-
-    for (uint32_t j=0 ; j < key_info->key_parts ; j++,key_part++)
-    {
-      if (j)
-        packet->append(',');
-
-      if (key_part->field)
-        packet->append_identifier(key_part->field->field_name,
-                                  strlen(key_part->field->field_name));
-      if (key_part->field &&
-          (key_part->length !=
-           table->getField(key_part->fieldnr-1)->key_length()))
-      {
-        buff.assign("(");
-        buff.append(to_string((int32_t) key_part->length /
-                              key_part->field->charset()->mbmaxlen));
-        buff.append(")");
-        packet->append(buff.c_str(), buff.length());
-      }
-    }
-    packet->append(')');
-    store_key_options(packet, table, key_info);
-  }
-
-  /*
-    Get possible foreign key definitions stored in InnoDB and append them
-    to the CREATE TABLE statement
-  */
-
-  if ((for_str= cursor->get_foreign_key_create_info()))
-  {
-    packet->append(for_str, strlen(for_str));
-    cursor->free_foreign_key_create_info(for_str);
-  }
-
-  packet->append(STRING_WITH_LEN("\n)"));
-  {
-    /*
-      Get possible table space definitions and append them
-      to the CREATE TABLE statement
-    */
-
-    /* 
-      We should always store engine since we will now be 
-      making sure engines accept options (aka... no
-      dangling arguments for engines.
-    */
-    packet->append(STRING_WITH_LEN(" ENGINE="));
-    packet->append(cursor->getEngine()->getName().c_str());
-
-    size_t num_engine_options= table->getShare()->getTableProto()->engine().options_size();
-    for (size_t x= 0; x < num_engine_options; ++x)
-    {
-      const message::Engine::Option &option= table->getShare()->getTableProto()->engine().options(x);
-      packet->append(" ");
-      packet->append(option.name().c_str());
-      packet->append("=");
-      append_unescaped(packet, option.state().c_str(), option.state().length());
-    }
-
-    if (table->getShare()->block_size)
-    {
-      packet->append(STRING_WITH_LEN(" BLOCK_SIZE="));
-      buff= to_string(table->getShare()->block_size);
-      packet->append(buff.c_str(), buff.length());
-    }
-    table->cursor->append_create_info(packet);
-    if (table->getMutableShare()->hasComment() && table->getMutableShare()->getCommentLength())
-    {
-      packet->append(STRING_WITH_LEN(" COMMENT="));
-      append_unescaped(packet, table->getMutableShare()->getComment(),
-                       table->getMutableShare()->getCommentLength());
-    }
-  }
-  table->restore_column_map(old_map);
+  string create_sql;
+
+  enum drizzled::message::TransformSqlError transform_err;
+
+  (void)is_if_not_exists;
+
+  transform_err= message::transformTableDefinitionToSql(*(table->getShare()->getTableProto()),
+                                                        create_sql,
+                                                        message::DRIZZLE,
+                                                        false);
+
+  packet->append(create_sql.c_str(), create_sql.length(), default_charset_info);
+
   return(0);
 }
 
-static void store_key_options(String *packet, Table *, KeyInfo *key_info)
-{
-  if (key_info->algorithm == HA_KEY_ALG_BTREE)
-    packet->append(STRING_WITH_LEN(" USING BTREE"));
-
-  if (key_info->algorithm == HA_KEY_ALG_HASH)
-    packet->append(STRING_WITH_LEN(" USING HASH"));
-
-  assert(test(key_info->flags & HA_USES_COMMENT) ==
-              (key_info->comment.length > 0));
-  if (key_info->flags & HA_USES_COMMENT)
-  {
-    packet->append(STRING_WITH_LEN(" COMMENT "));
-    append_unescaped(packet, key_info->comment.str,
-                     key_info->comment.length);
-  }
-}
-
-
 /****************************************************************************
   Return info about all processes
   returns for each thread: thread id, user, host, db, command, info

=== modified file 'drizzled/sql_table.cc'
--- drizzled/sql_table.cc	2010-08-12 23:40:12 +0000
+++ drizzled/sql_table.cc	2010-08-17 22:51:53 +0000
@@ -878,7 +878,18 @@
       fk_key_count++;
       if (((Foreign_key *)key)->validate(alter_info->create_list))
         return true;
+
       Foreign_key *fk_key= (Foreign_key*) key;
+
+      add_foreign_key_to_table_message(&create_proto,
+                                       fk_key->name.str,
+                                       fk_key->columns,
+                                       fk_key->ref_table,
+                                       fk_key->ref_columns,
+                                       fk_key->delete_opt,
+                                       fk_key->update_opt,
+                                       fk_key->match_opt);
+
       if (fk_key->ref_columns.elements &&
 	  fk_key->ref_columns.elements != fk_key->columns.elements)
       {
@@ -888,30 +899,6 @@
                  ER(ER_KEY_REF_DO_NOT_MATCH_TABLE_REF));
 	return(true);
       }
-
-      message::Table::ForeignKeyConstraint *pfkey= create_proto.add_fk_constraint();
-      if (fk_key->name.str)
-        pfkey->set_name(fk_key->name.str);
-
-      pfkey->set_match(fk_key->match_opt);
-      pfkey->set_update_option(fk_key->update_opt);
-      pfkey->set_delete_option(fk_key->delete_opt);
-
-      pfkey->set_references_table_name(fk_key->ref_table->table.str);
-
-      Key_part_spec *keypart;
-      List_iterator<Key_part_spec> col_it(fk_key->columns);
-      while ((keypart= col_it++))
-      {
-        pfkey->add_column_names(keypart->field_name.str);
-      }
-
-      List_iterator<Key_part_spec> ref_it(fk_key->ref_columns);
-      while ((keypart= ref_it++))
-      {
-        pfkey->add_references_columns(keypart->field_name.str);
-      }
-
       continue;
     }
     (*key_count)++;

=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy	2010-07-13 07:12:12 +0000
+++ drizzled/sql_yacc.yy	2010-08-17 22:51:53 +0000
@@ -1395,12 +1395,13 @@
           {
             LEX *lex=Lex;
             statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
-            Key *key= new Foreign_key($4.str ? $4 : $1, lex->col_list,
+            Key *key= new Foreign_key($1.str ? $1 : $4, lex->col_list,
                                       $8,
                                       lex->ref_list,
                                       statement->fk_delete_opt,
                                       statement->fk_update_opt,
                                       statement->fk_match_option);
+
             statement->alter_info.key_list.push_back(key);
             key= new Key(Key::MULTIPLE, $1.str ? $1 : $4,
                          &default_key_create_info, 1,
@@ -2256,7 +2257,8 @@
         | DROP FOREIGN KEY_SYM opt_ident
           {
             statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
-
+            statement->alter_info.drop_list.push_back(new AlterDrop(AlterDrop::FOREIGN_KEY,
+                                                                    $4.str));
             statement->alter_info.flags.set(ALTER_DROP_INDEX);
             statement->alter_info.flags.set(ALTER_FOREIGN_KEY);
           }

=== modified file 'drizzled/statement/alter_table.cc'
--- drizzled/statement/alter_table.cc	2010-08-17 01:34:55 +0000
+++ drizzled/statement/alter_table.cc	2010-08-17 22:51:53 +0000
@@ -267,6 +267,8 @@
     /* Table has an autoincrement, copy value to new table */
     table->cursor->info(HA_STATUS_AUTO);
     create_info->auto_increment_value= table->cursor->stats.auto_increment_value;
+    if (create_info->auto_increment_value != original_proto.options().auto_increment_value())
+      table_options->set_has_user_set_auto_increment_value(false);
   }
   table->restoreRecordAsDefault(); /* Empty record for DEFAULT */
   CreateField *def;
@@ -533,15 +535,53 @@
       new_key_list.push_back(key);
     }
   }
+
+  /* Copy over existing foreign keys */
+  for (int j= 0; j < original_proto.fk_constraint_size(); j++)
+  {
+    AlterDrop *drop;
+    drop_it.rewind();
+    while ((drop= drop_it++))
+    {
+      if (drop->type == AlterDrop::FOREIGN_KEY &&
+          ! my_strcasecmp(system_charset_info, original_proto.fk_constraint(j).name().c_str(), drop->name))
+      {
+        break;
+      }
+    }
+    if (drop)
+    {
+      drop_it.remove();
+      continue;
+    }
+
+    message::Table::ForeignKeyConstraint *pfkey= table_message.add_fk_constraint();
+    *pfkey= original_proto.fk_constraint(j);
+  }
+
   {
     Key *key;
     while ((key= key_it++)) /* Add new keys */
     {
-      if (key->type == Key::FOREIGN_KEY &&
-          ((Foreign_key *)key)->validate(new_create_list))
-        goto err;
+      if (key->type == Key::FOREIGN_KEY)
+      {
+        if (((Foreign_key *)key)->validate(new_create_list))
+          goto err;
+
+        Foreign_key *fkey= (Foreign_key*)key;
+        add_foreign_key_to_table_message(&table_message,
+                                         fkey->name.str,
+                                         fkey->columns,
+                                         fkey->ref_table,
+                                         fkey->ref_columns,
+                                         fkey->delete_opt,
+                                         fkey->update_opt,
+                                         fkey->match_opt);
+      }
+
       if (key->type != Key::FOREIGN_KEY)
         new_key_list.push_back(key);
+
       if (key->name.str && is_primary_key_name(key->name.str))
       {
         my_error(ER_WRONG_NAME_FOR_INDEX,
@@ -552,6 +592,23 @@
     }
   }
 
+  /* Fix names of foreign keys being added */
+  for (int j= 0; j < table_message.fk_constraint_size(); j++)
+  {
+    if (! table_message.fk_constraint(j).has_name())
+    {
+      std::string name(table->getMutableShare()->getTableName());
+      char number[20];
+
+      name.append("_ibfk_");
+      snprintf(number, sizeof(number), "%d", j+1);
+      name.append(number);
+
+      message::Table::ForeignKeyConstraint *pfkey= table_message.mutable_fk_constraint(j);
+      pfkey->set_name(name);
+    }
+  }
+
   if (alter_info->drop_list.elements)
   {
     my_error(ER_CANT_DROP_FIELD_OR_KEY,

=== modified file 'drizzled/table_ident.h'
--- drizzled/table_ident.h	2010-02-04 08:14:46 +0000
+++ drizzled/table_ident.h	2010-08-17 22:51:53 +0000
@@ -21,6 +21,8 @@
 #ifndef DRIZZLED_TABLE_IDENT_H
 #define DRIZZLED_TABLE_IDENT_H
 
+#include "drizzled/session.h"
+
 namespace drizzled
 {
 

=== modified file 'drizzled/table_proto_write.cc'
--- drizzled/table_proto_write.cc	2010-08-05 22:57:47 +0000
+++ drizzled/table_proto_write.cc	2010-08-17 22:51:53 +0000
@@ -357,6 +357,11 @@
     table_options->set_collation(create_info->default_table_charset->name);
   }
 
+  if (create_info->used_fields & HA_CREATE_USED_AUTO)
+    table_options->set_has_user_set_auto_increment_value(true);
+  else
+    table_options->set_has_user_set_auto_increment_value(false);
+
   if (create_info->auto_increment_value)
     table_options->set_auto_increment_value(create_info->auto_increment_value);
 

=== modified file 'plugin/archive/tests/r/archive.result'
--- plugin/archive/tests/r/archive.result	2009-12-04 10:20:37 +0000
+++ plugin/archive/tests/r/archive.result	2010-08-17 22:51:53 +0000
@@ -9920,7 +9920,7 @@
   `fld3` varchar(30) NOT NULL DEFAULT '',
   `fld4` varchar(35) NOT NULL DEFAULT '',
   `fld5` varchar(35) NOT NULL DEFAULT ''
-) ENGINE=ARCHIVE
+) ENGINE=ARCHIVE COLLATE = utf8_general_ci
 SELECT * FROM t2 WHERE auto != 100000;
 auto	fld1	companynr	fld3	fld4	fld5
 1	1	0	Omaha	teethe	neat
@@ -11441,7 +11441,7 @@
   `b` blob,
   `c` int DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ARCHIVE
+) ENGINE=ARCHIVE COLLATE = utf8_general_ci
 DROP TABLE t1, t2, t4, t5, t6;
 create table t1(a blob) engine=archive;
 insert into t1 set a='';

=== modified file 'plugin/archive/tests/r/archive_aio_posix.result'
--- plugin/archive/tests/r/archive_aio_posix.result	2009-12-04 10:20:37 +0000
+++ plugin/archive/tests/r/archive_aio_posix.result	2010-08-17 22:51:53 +0000
@@ -9920,7 +9920,7 @@
   `fld3` varchar(30) NOT NULL DEFAULT '',
   `fld4` varchar(35) NOT NULL DEFAULT '',
   `fld5` varchar(35) NOT NULL DEFAULT ''
-) ENGINE=ARCHIVE
+) ENGINE=ARCHIVE COLLATE = utf8_general_ci
 SELECT * FROM t2;
 auto	fld1	companynr	fld3	fld4	fld5
 1	1	0	Omaha	teethe	neat
@@ -11441,7 +11441,7 @@
   `b` blob,
   `c` int DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ARCHIVE
+) ENGINE=ARCHIVE COLLATE = utf8_general_ci
 DROP TABLE t1, t2, t4, t5, t6;
 create table t1(a longblob) engine=archive;
 insert into t1 set a='';

=== modified file 'plugin/blackhole/tests/r/create_max_fields.result'
--- plugin/blackhole/tests/r/create_max_fields.result	2010-03-23 10:01:41 +0000
+++ plugin/blackhole/tests/r/create_max_fields.result	2010-08-17 22:51:53 +0000
@@ -8197,7 +8197,7 @@
   `f4094` int DEFAULT NULL,
   `f4095` int DEFAULT NULL,
   `f4096` int DEFAULT NULL
-) ENGINE=BLACKHOLE
+) ENGINE=BLACKHOLE COLLATE = utf8_general_ci
 DROP TABLE t1;
 Now, MAX_FIELDS. This fails.
 CREATE TABLE t1 (

=== modified file 'plugin/blitzdb/tests/r/blitzdb-basic.result'
--- plugin/blitzdb/tests/r/blitzdb-basic.result	2010-07-13 06:12:40 +0000
+++ plugin/blitzdb/tests/r/blitzdb-basic.result	2010-08-17 22:51:53 +0000
@@ -101,7 +101,7 @@
   `a` int DEFAULT NULL,
   `b` int DEFAULT NULL,
   `c` varchar(255) DEFAULT NULL
-) ENGINE=BLITZDB
+) ENGINE=BLITZDB COLLATE = utf8_general_ci
 select count(*) from t2;
 count(*)
 8

=== modified file 'plugin/collation_dictionary/tests/r/data_dictionary.result'
--- plugin/collation_dictionary/tests/r/data_dictionary.result	2010-07-13 07:12:02 +0000
+++ plugin/collation_dictionary/tests/r/data_dictionary.result	2010-08-17 22:51:53 +0000
@@ -1,15 +1,15 @@
 use data_dictionary;
 show create table CHARACTER_SETS ;
 Table	Create Table
-CHARACTER_SETS	CREATE TABLE `character_sets` (
+CHARACTER_SETS	CREATE TABLE `CHARACTER_SETS` (
   `CHARACTER_SET_NAME` varchar(256) NOT NULL,
   `DEFAULT_COLLATE_NAME` varchar(256) NOT NULL,
   `DESCRIPTION` varchar(256) NOT NULL,
   `MAXLEN` bigint NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table COLLATIONS ;
 Table	Create Table
-COLLATIONS	CREATE TABLE `collations` (
+COLLATIONS	CREATE TABLE `COLLATIONS` (
   `CHARACTER_SET_NAME` varchar(256) NOT NULL,
   `COLLATION_NAME` varchar(256) NOT NULL,
   `DESCRIPTION` varchar(256) NOT NULL,
@@ -17,7 +17,7 @@
   `IS_DEFAULT` varchar(5) NOT NULL,
   `IS_COMPILED` varchar(5) NOT NULL,
   `SORTLEN` bigint NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SELECT * FROM character_sets ORDER BY CHARACTER_SET_NAME;
 CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
 binary	binary		1

=== modified file 'plugin/filesystem_engine/tests/r/basic_create_table.result'
--- plugin/filesystem_engine/tests/r/basic_create_table.result	2010-06-29 13:21:24 +0000
+++ plugin/filesystem_engine/tests/r/basic_create_table.result	2010-08-17 22:51:53 +0000
@@ -12,5 +12,5 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=FILESYSTEM FILE='../filesystem_ln/basic_create_table.data'
+) ENGINE=FILESYSTEM FILE='../filesystem_ln/basic_create_table.data' COLLATE = utf8_general_ci
 DROP TABLE t1;

=== modified file 'plugin/filesystem_engine/tests/r/select_cpuinfo.result'
--- plugin/filesystem_engine/tests/r/select_cpuinfo.result	2010-07-13 04:41:05 +0000
+++ plugin/filesystem_engine/tests/r/select_cpuinfo.result	2010-08-17 22:51:53 +0000
@@ -7,29 +7,29 @@
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `address sizes` varchar(34) DEFAULT NULL,
-  `apicid` varchar(2) DEFAULT NULL,
-  `bogomips` varchar(8) DEFAULT NULL,
-  `cache size` varchar(8) DEFAULT NULL,
-  `cache_alignment` varchar(3) DEFAULT NULL,
-  `clflush size` varchar(3) DEFAULT NULL,
-  `core id` varchar(2) DEFAULT NULL,
-  `cpu MHz` varchar(9) DEFAULT NULL,
-  `cpu cores` varchar(2) DEFAULT NULL,
-  `cpu family` varchar(2) DEFAULT NULL,
-  `cpuid level` varchar(3) DEFAULT NULL,
-  `flags` varchar(249) DEFAULT NULL,
-  `fpu` varchar(4) DEFAULT NULL,
-  `fpu_exception` varchar(4) DEFAULT NULL,
-  `initial apicid` varchar(2) DEFAULT NULL,
-  `model` varchar(3) DEFAULT NULL,
-  `model name` varchar(48) DEFAULT NULL,
-  `physical id` varchar(2) DEFAULT NULL,
-  `power management` varchar(1) DEFAULT NULL,
-  `processor` varchar(2) DEFAULT NULL,
-  `siblings` varchar(2) DEFAULT NULL,
-  `stepping` varchar(3) DEFAULT NULL,
-  `vendor_id` varchar(13) DEFAULT NULL,
-  `wp` varchar(4) DEFAULT NULL
-) ENGINE=FILESYSTEM FILE='../filesystem_ln/select_cpuinfo.data' FORMAT='KEY_VALUE' COL_SEPARATOR=':'
+  `address sizes` varchar(34),
+  `apicid` varchar(2),
+  `bogomips` varchar(8),
+  `cache size` varchar(8),
+  `cache_alignment` varchar(3),
+  `clflush size` varchar(3),
+  `core id` varchar(2),
+  `cpu MHz` varchar(9),
+  `cpu cores` varchar(2),
+  `cpu family` varchar(2),
+  `cpuid level` varchar(3),
+  `flags` varchar(249),
+  `fpu` varchar(4),
+  `fpu_exception` varchar(4),
+  `initial apicid` varchar(2),
+  `model` varchar(3),
+  `model name` varchar(48),
+  `physical id` varchar(2),
+  `power management` varchar(1),
+  `processor` varchar(2),
+  `siblings` varchar(2),
+  `stepping` varchar(3),
+  `vendor_id` varchar(13),
+  `wp` varchar(4)
+) ENGINE=FILESYSTEM FILE='../filesystem_ln/select_cpuinfo.data', FORMAT='KEY_VALUE', COL_SEPARATOR=':' COLLATE = utf8_general_ci
 DROP TABLE t1;

=== modified file 'plugin/filesystem_engine/tests/r/select_meminfo.result'
--- plugin/filesystem_engine/tests/r/select_meminfo.result	2010-07-11 08:26:34 +0000
+++ plugin/filesystem_engine/tests/r/select_meminfo.result	2010-08-17 22:51:53 +0000
@@ -6,37 +6,37 @@
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `Active` varchar(8) DEFAULT NULL,
-  `AnonPages` varchar(7) DEFAULT NULL,
-  `Bounce` varchar(2) DEFAULT NULL,
-  `Buffers` varchar(7) DEFAULT NULL,
-  `Cached` varchar(8) DEFAULT NULL,
-  `CommitLimit` varchar(8) DEFAULT NULL,
-  `Committed_AS` varchar(7) DEFAULT NULL,
-  `DirectMap2M` varchar(8) DEFAULT NULL,
-  `DirectMap4k` varchar(5) DEFAULT NULL,
-  `Dirty` varchar(5) DEFAULT NULL,
-  `HugePages_Free` varchar(2) DEFAULT NULL,
-  `HugePages_Rsvd` varchar(2) DEFAULT NULL,
-  `HugePages_Surp` varchar(2) DEFAULT NULL,
-  `HugePages_Total` varchar(2) DEFAULT NULL,
-  `Hugepagesize` varchar(5) DEFAULT NULL,
-  `Inactive` varchar(8) DEFAULT NULL,
-  `Mapped` varchar(6) DEFAULT NULL,
-  `MemFree` varchar(7) DEFAULT NULL,
-  `MemTotal` varchar(8) DEFAULT NULL,
-  `NFS_Unstable` varchar(2) DEFAULT NULL,
-  `PageTables` varchar(6) DEFAULT NULL,
-  `SReclaimable` varchar(7) DEFAULT NULL,
-  `SUnreclaim` varchar(6) DEFAULT NULL,
-  `Slab` varchar(7) DEFAULT NULL,
-  `SwapCached` varchar(2) DEFAULT NULL,
-  `SwapFree` varchar(7) DEFAULT NULL,
-  `SwapTotal` varchar(7) DEFAULT NULL,
-  `VmallocChunk` varchar(12) DEFAULT NULL,
-  `VmallocTotal` varchar(12) DEFAULT NULL,
-  `VmallocUsed` varchar(6) DEFAULT NULL,
-  `Writeback` varchar(2) DEFAULT NULL,
-  `WritebackTmp` varchar(2) DEFAULT NULL
-) ENGINE=FILESYSTEM FILE='../filesystem_ln/select_meminfo.data' FORMAT='KEY_VALUE' COL_SEPARATOR=': '
+  `Active` varchar(8),
+  `AnonPages` varchar(7),
+  `Bounce` varchar(2),
+  `Buffers` varchar(7),
+  `Cached` varchar(8),
+  `CommitLimit` varchar(8),
+  `Committed_AS` varchar(7),
+  `DirectMap2M` varchar(8),
+  `DirectMap4k` varchar(5),
+  `Dirty` varchar(5),
+  `HugePages_Free` varchar(2),
+  `HugePages_Rsvd` varchar(2),
+  `HugePages_Surp` varchar(2),
+  `HugePages_Total` varchar(2),
+  `Hugepagesize` varchar(5),
+  `Inactive` varchar(8),
+  `Mapped` varchar(6),
+  `MemFree` varchar(7),
+  `MemTotal` varchar(8),
+  `NFS_Unstable` varchar(2),
+  `PageTables` varchar(6),
+  `SReclaimable` varchar(7),
+  `SUnreclaim` varchar(6),
+  `Slab` varchar(7),
+  `SwapCached` varchar(2),
+  `SwapFree` varchar(7),
+  `SwapTotal` varchar(7),
+  `VmallocChunk` varchar(12),
+  `VmallocTotal` varchar(12),
+  `VmallocUsed` varchar(6),
+  `Writeback` varchar(2),
+  `WritebackTmp` varchar(2)
+) ENGINE=FILESYSTEM FILE='../filesystem_ln/select_meminfo.data', FORMAT='KEY_VALUE', COL_SEPARATOR=': ' COLLATE = utf8_general_ci
 DROP TABLE t1;

=== modified file 'plugin/information_schema_dictionary/tests/r/show_create_table.result'
--- plugin/information_schema_dictionary/tests/r/show_create_table.result	2010-07-13 09:09:38 +0000
+++ plugin/information_schema_dictionary/tests/r/show_create_table.result	2010-08-17 22:51:53 +0000
@@ -1,15 +1,15 @@
 use information_schema;
 SHOW CREATE TABLE `CHECK_CONSTRAINTS`;
 Table	Create Table
-CHECK_CONSTRAINTS	CREATE TABLE `check_constraints` (
+CHECK_CONSTRAINTS	CREATE TABLE `CHECK_CONSTRAINTS` (
   `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL,
   `CHECK_CLAUSE` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `COLUMNS`;
 Table	Create Table
-COLUMNS	CREATE TABLE `columns` (
+COLUMNS	CREATE TABLE `COLUMNS` (
   `TABLE_CATALOG` varchar(256) NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
@@ -33,10 +33,10 @@
   `DOMAIN_CATALOG` varchar(256) DEFAULT NULL,
   `DOMAIN_SCHEMA` varchar(256) DEFAULT NULL,
   `DOMAIN_NAME` varchar(256) DEFAULT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `COLUMN_DOMAIN_USAGE`;
 Table	Create Table
-COLUMN_DOMAIN_USAGE	CREATE TABLE `column_domain_usage` (
+COLUMN_DOMAIN_USAGE	CREATE TABLE `COLUMN_DOMAIN_USAGE` (
   `DOMAIN_CATALOG` varchar(256) NOT NULL,
   `DOMAIN_SCHEMA` varchar(256) NOT NULL,
   `DOMAIN_NAME` varchar(256) NOT NULL,
@@ -44,10 +44,10 @@
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `COLUMN_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `COLUMN_PRIVILEGES`;
 Table	Create Table
-COLUMN_PRIVILEGES	CREATE TABLE `column_privileges` (
+COLUMN_PRIVILEGES	CREATE TABLE `COLUMN_PRIVILEGES` (
   `GRANTOR` varchar(256) NOT NULL,
   `GRANTEE` varchar(256) NOT NULL,
   `TABLE_CATALOG` varchar(256) NOT NULL,
@@ -56,10 +56,10 @@
   `COLUMN_NAME` varchar(256) NOT NULL,
   `PRIVILEGE_TYPE` varchar(256) NOT NULL,
   `IS_GRANTABLE` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `CONSTRAINT_COLUMN_USAGE`;
 Table	Create Table
-CONSTRAINT_COLUMN_USAGE	CREATE TABLE `constraint_column_usage` (
+CONSTRAINT_COLUMN_USAGE	CREATE TABLE `CONSTRAINT_COLUMN_USAGE` (
   `TABLE_CATALOG` varchar(256) NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
@@ -67,20 +67,20 @@
   `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `CONSTRAINT_TABLE_USAGE`;
 Table	Create Table
-CONSTRAINT_TABLE_USAGE	CREATE TABLE `constraint_table_usage` (
+CONSTRAINT_TABLE_USAGE	CREATE TABLE `CONSTRAINT_TABLE_USAGE` (
   `TABLE_CATALOG` varchar(256) NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `DOMAINS`;
 Table	Create Table
-DOMAINS	CREATE TABLE `domains` (
+DOMAINS	CREATE TABLE `DOMAINS` (
   `DOMAIN_CATALOG` varchar(256) NOT NULL,
   `DOMAIN_SCHEMA` varchar(256) NOT NULL,
   `DOMAIN_NAME` varchar(256) NOT NULL,
@@ -98,10 +98,10 @@
   `NUMERIC_SCALE` varchar(256) NOT NULL,
   `DATETIME_PRECISION` varchar(256) NOT NULL,
   `DOMAIN_DEFAULT` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `DOMAIN_CONSTRAINTS`;
 Table	Create Table
-DOMAIN_CONSTRAINTS	CREATE TABLE `domain_constraints` (
+DOMAIN_CONSTRAINTS	CREATE TABLE `DOMAIN_CONSTRAINTS` (
   `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL,
@@ -110,10 +110,10 @@
   `DOMAIN_NAME` varchar(256) NOT NULL,
   `IS_DEFERRABLE` varchar(256) NOT NULL,
   `INITIALLY_DEFERRED` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `KEY_COLUMN_USAGE`;
 Table	Create Table
-KEY_COLUMN_USAGE	CREATE TABLE `key_column_usage` (
+KEY_COLUMN_USAGE	CREATE TABLE `KEY_COLUMN_USAGE` (
   `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL,
@@ -122,10 +122,10 @@
   `TABLE_NAME` varchar(256) NOT NULL,
   `COLUMN_NAME` varchar(256) NOT NULL,
   `ORDINAL_POSITION` bigint NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `PARAMETERS`;
 Table	Create Table
-PARAMETERS	CREATE TABLE `parameters` (
+PARAMETERS	CREATE TABLE `PARAMETERS` (
   `SPECIFIC_CATALOG` varchar(256) NOT NULL,
   `SPECIFIC_SCHEMA` varchar(256) NOT NULL,
   `SPECIFIC_NAME` varchar(256) NOT NULL,
@@ -156,10 +156,10 @@
   `SCOPE_CATALOG` varchar(256) NOT NULL,
   `SCOPE_SCHEMA` varchar(256) NOT NULL,
   `SCOPE_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `REFERENTIAL_CONSTRAINTS`;
 Table	Create Table
-REFERENTIAL_CONSTRAINTS	CREATE TABLE `referential_constraints` (
+REFERENTIAL_CONSTRAINTS	CREATE TABLE `REFERENTIAL_CONSTRAINTS` (
   `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL,
@@ -169,10 +169,10 @@
   `MATCH_OPTION` varchar(256) NOT NULL,
   `UPDATE_RULE` varchar(256) NOT NULL,
   `DELETE_RULE` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `ROUTINES`;
 Table	Create Table
-ROUTINES	CREATE TABLE `routines` (
+ROUTINES	CREATE TABLE `ROUTINES` (
   `SPECIFIC_CATALOG` varchar(256) NOT NULL,
   `SPECIFIC_SCHEMA` varchar(256) NOT NULL,
   `SPECIFIC_NAME` varchar(256) NOT NULL,
@@ -226,10 +226,10 @@
   `IS_IMPLICITLY_INVOCABLE` varchar(256) NOT NULL,
   `CREATED` varchar(256) NOT NULL,
   `LAST_ALTERED` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `ROUTINE_COLUMNS`;
 Table	Create Table
-ROUTINE_COLUMNS	CREATE TABLE `routine_columns` (
+ROUTINE_COLUMNS	CREATE TABLE `ROUTINE_COLUMNS` (
   `TABLE_CATALOG` varchar(256) NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
@@ -253,28 +253,28 @@
   `DOMAIN_CATALOG` varchar(256) NOT NULL,
   `DOMAIN_SCHEMA` varchar(256) NOT NULL,
   `DOMAIN_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `SCHEMATA`;
 Table	Create Table
-SCHEMATA	CREATE TABLE `schemata` (
+SCHEMATA	CREATE TABLE `SCHEMATA` (
   `CATALOG_NAME` varchar(256) NOT NULL,
   `SCHEMA_NAME` varchar(256) NOT NULL,
   `SCHEMA_OWNER` varchar(256) NOT NULL,
   `DEFAULT_CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
   `DEFAULT_CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
   `DEFAULT_CHARACTER_SET_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `TABLES`;
 Table	Create Table
-TABLES	CREATE TABLE `tables` (
+TABLES	CREATE TABLE `TABLES` (
   `TABLE_CATALOG` varchar(256) NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `TABLE_TYPE` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `TABLE_CONSTRAINTS`;
 Table	Create Table
-TABLE_CONSTRAINTS	CREATE TABLE `table_constraints` (
+TABLE_CONSTRAINTS	CREATE TABLE `TABLE_CONSTRAINTS` (
   `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL,
@@ -284,10 +284,10 @@
   `CONSTRAINT_TYPE` varchar(256) NOT NULL,
   `IS_DEFERRABLE` varchar(5) NOT NULL,
   `INITIALLY_DEFERRED` varchar(5) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `TABLE_PRIVILEGES`;
 Table	Create Table
-TABLE_PRIVILEGES	CREATE TABLE `table_privileges` (
+TABLE_PRIVILEGES	CREATE TABLE `TABLE_PRIVILEGES` (
   `GRANTOR` varchar(256) NOT NULL,
   `GRANTEE` varchar(256) NOT NULL,
   `TABLE_CATALOG` varchar(256) NOT NULL,
@@ -296,20 +296,20 @@
   `COLUMN_NAME` varchar(256) NOT NULL,
   `PRIVILEGE_TYPE` varchar(256) NOT NULL,
   `IS_GRANTABLE` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `VIEWS`;
 Table	Create Table
-VIEWS	CREATE TABLE `views` (
+VIEWS	CREATE TABLE `VIEWS` (
   `VIEW_CATALOG` varchar(256) NOT NULL,
   `VIEW_SCHEMA` varchar(256) NOT NULL,
   `VIEW_NAME` varchar(256) NOT NULL,
   `TABLE_CATALOG` varchar(256) NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `VIEW_COLUMN_USAGE`;
 Table	Create Table
-VIEW_COLUMN_USAGE	CREATE TABLE `view_column_usage` (
+VIEW_COLUMN_USAGE	CREATE TABLE `VIEW_COLUMN_USAGE` (
   `VIEW_CATALOG` varchar(256) NOT NULL,
   `VIEW_SCHEMA` varchar(256) NOT NULL,
   `VIEW_NAME` varchar(256) NOT NULL,
@@ -317,14 +317,14 @@
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `COLUMN_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SHOW CREATE TABLE `VIEW_TABLE_USAGE`;
 Table	Create Table
-VIEW_TABLE_USAGE	CREATE TABLE `view_table_usage` (
+VIEW_TABLE_USAGE	CREATE TABLE `VIEW_TABLE_USAGE` (
   `TABLE_CATALOG` varchar(256) NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `VIEW_DEFINITION` varchar(256) NOT NULL,
   `CHECK_OPTION` varchar(256) NOT NULL,
   `IS_UPDATABLE` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2010-08-16 18:18:51 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2010-08-17 22:51:53 +0000
@@ -86,6 +86,7 @@
 #include "drizzled/named_savepoint.h"
 
 #include <drizzled/transaction_services.h>
+#include "drizzled/message/statement_transform.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/program_options.hpp>
@@ -5829,8 +5830,20 @@
   }
 
   if (trx->mysql_query_str) {
+    string generated_create_table;
+    const char *query= trx->mysql_query_str;
+
+    if (session_sql_command(&session) == SQLCOM_CREATE_TABLE)
+    {
+      message::transformTableDefinitionToSql(create_proto,
+                                             generated_create_table,
+                                             message::DRIZZLE, true);
+      query= generated_create_table.c_str();
+    }
+
     error = row_table_add_foreign_constraints(trx,
-                                              trx->mysql_query_str, norm_name,
+                                              query,
+                                              norm_name,
                                               lex_identified_temp_table);
 
     error = convert_error_code_to_mysql(error, iflags, NULL);

=== modified file 'plugin/innobase/tests/r/innodb_cmp.result'
--- plugin/innobase/tests/r/innodb_cmp.result	2010-07-02 03:52:23 +0000
+++ plugin/innobase/tests/r/innodb_cmp.result	2010-08-17 22:51:53 +0000
@@ -8,11 +8,11 @@
 16384	0	0	0	0	0
 show create table INNODB_CMP;
 Table	Create Table
-INNODB_CMP	CREATE TABLE `innodb_cmp` (
+INNODB_CMP	CREATE TABLE `INNODB_CMP` (
   `PAGE_SIZE` bigint NOT NULL,
   `COMPRESS_OPS` bigint NOT NULL,
   `COMPRESS_OPS_OK` bigint NOT NULL,
   `COMPRESS_TIME` bigint NOT NULL,
   `UNCOMPRESS_OPS` bigint NOT NULL,
   `UNCOMPRESS_TIME` bigint NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/innobase/tests/r/innodb_cmp_reset.result'
--- plugin/innobase/tests/r/innodb_cmp_reset.result	2010-07-02 03:52:23 +0000
+++ plugin/innobase/tests/r/innodb_cmp_reset.result	2010-08-17 22:51:53 +0000
@@ -8,11 +8,11 @@
 16384	0	0	0	0	0
 show create table INNODB_CMP_RESET;
 Table	Create Table
-INNODB_CMP_RESET	CREATE TABLE `innodb_cmp_reset` (
+INNODB_CMP_RESET	CREATE TABLE `INNODB_CMP_RESET` (
   `PAGE_SIZE` bigint NOT NULL,
   `COMPRESS_OPS` bigint NOT NULL,
   `COMPRESS_OPS_OK` bigint NOT NULL,
   `COMPRESS_TIME` bigint NOT NULL,
   `UNCOMPRESS_OPS` bigint NOT NULL,
   `UNCOMPRESS_TIME` bigint NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/innobase/tests/r/innodb_cmpmem.result'
--- plugin/innobase/tests/r/innodb_cmpmem.result	2010-07-02 03:52:23 +0000
+++ plugin/innobase/tests/r/innodb_cmpmem.result	2010-08-17 22:51:53 +0000
@@ -11,10 +11,10 @@
 16384	0	0	0	0
 show create table INNODB_CMPMEM;
 Table	Create Table
-INNODB_CMPMEM	CREATE TABLE `innodb_cmpmem` (
+INNODB_CMPMEM	CREATE TABLE `INNODB_CMPMEM` (
   `PAGE_SIZE` bigint NOT NULL,
   `PAGES_USED` bigint NOT NULL,
   `PAGES_FREE` bigint NOT NULL,
   `RELOCATION_OPS` bigint NOT NULL,
   `RELOCATION_TIME` bigint NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/innobase/tests/r/innodb_cmpmem_reset.result'
--- plugin/innobase/tests/r/innodb_cmpmem_reset.result	2010-07-02 03:52:23 +0000
+++ plugin/innobase/tests/r/innodb_cmpmem_reset.result	2010-08-17 22:51:53 +0000
@@ -11,10 +11,10 @@
 16384	0	0	0	0
 show create table INNODB_CMPMEM_RESET;
 Table	Create Table
-INNODB_CMPMEM_RESET	CREATE TABLE `innodb_cmpmem_reset` (
+INNODB_CMPMEM_RESET	CREATE TABLE `INNODB_CMPMEM_RESET` (
   `PAGE_SIZE` bigint NOT NULL,
   `PAGES_USED` bigint NOT NULL,
   `PAGES_FREE` bigint NOT NULL,
   `RELOCATION_OPS` bigint NOT NULL,
   `RELOCATION_TIME` bigint NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/innobase/tests/r/innodb_lock_waits.result'
--- plugin/innobase/tests/r/innodb_lock_waits.result	2010-07-02 03:52:23 +0000
+++ plugin/innobase/tests/r/innodb_lock_waits.result	2010-08-17 22:51:53 +0000
@@ -3,9 +3,9 @@
 REQUESTING_TRX_ID	REQUESTED_LOCK_ID	BLOCKING_TRX_ID	BLOCKING_LOCK_ID
 show create table INNODB_LOCK_WAITS;
 Table	Create Table
-INNODB_LOCK_WAITS	CREATE TABLE `innodb_lock_waits` (
+INNODB_LOCK_WAITS	CREATE TABLE `INNODB_LOCK_WAITS` (
   `REQUESTING_TRX_ID` varchar(256) NOT NULL,
   `REQUESTED_LOCK_ID` varchar(256) NOT NULL,
   `BLOCKING_TRX_ID` varchar(256) NOT NULL,
   `BLOCKING_LOCK_ID` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/innobase/tests/r/innodb_locks.result'
--- plugin/innobase/tests/r/innodb_locks.result	2010-07-02 03:52:23 +0000
+++ plugin/innobase/tests/r/innodb_locks.result	2010-08-17 22:51:53 +0000
@@ -3,7 +3,7 @@
 LOCK_ID	LOCK_TRX_ID	LOCK_MODE	LOCK_TYPE	LOCK_TABLE	LOCK_INDEX	LOCK_SPACE	LOCK_PAGE	LOCK_REC	LOCK_DATA
 show create table INNODB_LOCKS;
 Table	Create Table
-INNODB_LOCKS	CREATE TABLE `innodb_locks` (
+INNODB_LOCKS	CREATE TABLE `INNODB_LOCKS` (
   `LOCK_ID` varchar(256) NOT NULL,
   `LOCK_TRX_ID` varchar(256) NOT NULL,
   `LOCK_MODE` varchar(256) NOT NULL,
@@ -14,4 +14,4 @@
   `LOCK_PAGE` bigint NOT NULL,
   `LOCK_REC` bigint NOT NULL,
   `LOCK_DATA` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/innobase/tests/r/innodb_status.result'
--- plugin/innobase/tests/r/innodb_status.result	2010-07-02 03:52:23 +0000
+++ plugin/innobase/tests/r/innodb_status.result	2010-08-17 22:51:53 +0000
@@ -4,7 +4,7 @@
 43
 show create table INNODB_STATUS;
 Table	Create Table
-INNODB_STATUS	CREATE TABLE `innodb_status` (
+INNODB_STATUS	CREATE TABLE `INNODB_STATUS` (
   `VARIABLE_NAME` varchar(256) NOT NULL,
   `VARIABLE_VALUE` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/innobase/tests/r/innodb_trx.result'
--- plugin/innobase/tests/r/innodb_trx.result	2010-07-02 03:52:23 +0000
+++ plugin/innobase/tests/r/innodb_trx.result	2010-08-17 22:51:53 +0000
@@ -3,7 +3,7 @@
 TRX_ID	TRX_STATE	TRX_STARTED	TRX_REQUESTED_LOCK_ID	TRX_WAIT_STARTED	TRX_WEIGHT	TRX_DRIZZLE_THREAD_ID	TRX_QUERY
 show create table INNODB_TRX;
 Table	Create Table
-INNODB_TRX	CREATE TABLE `innodb_trx` (
+INNODB_TRX	CREATE TABLE `INNODB_TRX` (
   `TRX_ID` varchar(256) NOT NULL,
   `TRX_STATE` varchar(256) NOT NULL,
   `TRX_STARTED` bigint NOT NULL,
@@ -12,4 +12,4 @@
   `TRX_WEIGHT` bigint NOT NULL,
   `TRX_DRIZZLE_THREAD_ID` bigint NOT NULL,
   `TRX_QUERY` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/logging_stats/tests/r/command.result'
--- plugin/logging_stats/tests/r/command.result	2010-07-02 03:52:23 +0000
+++ plugin/logging_stats/tests/r/command.result	2010-08-17 22:51:53 +0000
@@ -21,10 +21,10 @@
 set global logging_stats_enable=true;
 SHOW CREATE TABLE data_dictionary.SESSION_STATEMENTS;
 Table	Create Table
-SESSION_STATEMENTS	CREATE TABLE `session_statements` (
+SESSION_STATEMENTS	CREATE TABLE `SESSION_STATEMENTS` (
   `VARIABLE_NAME` varchar(256) NOT NULL,
   `VARIABLE_VALUE` varchar(1024) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SELECT count(*) FROM data_dictionary.SESSION_STATEMENTS;
 count(*)
 #

=== modified file 'plugin/logging_stats/tests/r/max_user.result'
--- plugin/logging_stats/tests/r/max_user.result	2010-07-02 03:52:23 +0000
+++ plugin/logging_stats/tests/r/max_user.result	2010-08-17 22:51:53 +0000
@@ -510,10 +510,10 @@
 505	0	0	0	1	0	0	0	0	0	0
 SHOW CREATE TABLE data_dictionary.GLOBAL_STATEMENTS;
 Table	Create Table
-GLOBAL_STATEMENTS	CREATE TABLE `global_statements` (
+GLOBAL_STATEMENTS	CREATE TABLE `GLOBAL_STATEMENTS` (
   `VARIABLE_NAME` varchar(256) NOT NULL,
   `VARIABLE_VALUE` varchar(1024) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SELECT count(*) FROM data_dictionary.GLOBAL_STATEMENTS;
 count(*)
 #

=== modified file 'plugin/myisam/tests/r/myisam.result'
--- plugin/myisam/tests/r/myisam.result	2010-08-15 11:35:47 +0000
+++ plugin/myisam/tests/r/myisam.result	2010-08-17 22:51:53 +0000
@@ -794,7 +794,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 create TEMPORARY table t2 like t1;
 show create table t2;
 Table	Create Table
@@ -802,7 +802,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 create TEMPORARY table t3 select * from t1;
 show create table t3;
 Table	Create Table
@@ -810,7 +810,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
@@ -818,7 +818,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
@@ -826,7 +826,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 alter table t1 modify t varchar(10);
 show create table t1;
 Table	Create Table
@@ -834,7 +834,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+ *+ *
@@ -850,7 +850,7 @@
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select count(*) from t1;
 count(*)
 270
@@ -1069,7 +1069,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select count(*) from t1 where v='a';
 count(*)
 10
@@ -1149,7 +1149,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select count(*) from t1 where v='a';
 count(*)
 10
@@ -1231,7 +1231,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(333))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a
	1
@@ -1309,14 +1309,14 @@
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 drop table t1;
 create TEMPORARY table t1 (v char(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `v` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 drop table t1;
 create TEMPORARY table t1 (v varchar(10), c char(10));
 show create table t1;
@@ -1324,7 +1324,7 @@
 t1	CREATE TEMPORARY TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 insert into t1 values('a','a'),('a ','a ');
 select concat('*',v,'*',c,'*') from t1;
 concat('*',v,'*',c,'*')

=== modified file 'plugin/registry_dictionary/tests/r/data_dictionary.result'
--- plugin/registry_dictionary/tests/r/data_dictionary.result	2010-07-02 03:52:23 +0000
+++ plugin/registry_dictionary/tests/r/data_dictionary.result	2010-08-17 22:51:53 +0000
@@ -7,7 +7,7 @@
 #
 show create table MODULES ;
 Table	Create Table
-MODULES	CREATE TABLE `modules` (
+MODULES	CREATE TABLE `MODULES` (
   `MODULE_NAME` varchar(256) NOT NULL,
   `MODULE_VERSION` varchar(20) NOT NULL,
   `MODULE_AUTHOR` varchar(256) NOT NULL,
@@ -15,12 +15,12 @@
   `MODULE_LIBRARY` varchar(254) NOT NULL,
   `MODULE_DESCRIPTION` varchar(254) NOT NULL,
   `MODULE_LICENSE` varchar(80) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table PLUGINS ;
 Table	Create Table
-PLUGINS	CREATE TABLE `plugins` (
+PLUGINS	CREATE TABLE `PLUGINS` (
   `PLUGIN_NAME` varchar(256) NOT NULL,
   `PLUGIN_TYPE` varchar(256) NOT NULL,
   `IS_ACTIVE` varchar(5) NOT NULL,
   `MODULE_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/replication_dictionary/tests/r/data_dictionary.result'
--- plugin/replication_dictionary/tests/r/data_dictionary.result	2010-07-02 03:52:23 +0000
+++ plugin/replication_dictionary/tests/r/data_dictionary.result	2010-08-17 22:51:53 +0000
@@ -4,7 +4,7 @@
 #
 show create table replication_streams;
 Table	Create Table
-replication_streams	CREATE TABLE `replication_streams` (
+replication_streams	CREATE TABLE `REPLICATION_STREAMS` (
   `REPLICATOR` varchar(256) NOT NULL,
   `APPLIER` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci

=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
--- plugin/schema_dictionary/tests/r/data_dictionary.result	2010-08-05 20:24:49 +0000
+++ plugin/schema_dictionary/tests/r/data_dictionary.result	2010-08-17 22:51:53 +0000
@@ -510,7 +510,7 @@
 0
 show create table COLUMNS ;
 Table	Create Table
-COLUMNS	CREATE TABLE `columns` (
+COLUMNS	CREATE TABLE `COLUMNS` (
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `COLUMN_NAME` varchar(256) NOT NULL,
@@ -533,10 +533,10 @@
   `NUMERIC_SCALE` bigint DEFAULT NULL,
   `COLLATION_NAME` varchar(256) NOT NULL,
   `COLUMN_COMMENT` varchar(1024) DEFAULT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table INDEXES ;
 Table	Create Table
-INDEXES	CREATE TABLE `indexes` (
+INDEXES	CREATE TABLE `INDEXES` (
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `INDEX_NAME` varchar(256) NOT NULL,
@@ -546,10 +546,10 @@
   `KEY_LENGTH` bigint NOT NULL,
   `INDEX_TYPE` varchar(256) NOT NULL,
   `INDEX_COMMENT` varchar(1024) DEFAULT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table INDEX_PARTS ;
 Table	Create Table
-INDEX_PARTS	CREATE TABLE `index_parts` (
+INDEX_PARTS	CREATE TABLE `INDEX_PARTS` (
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `INDEX_NAME` varchar(256) NOT NULL,
@@ -561,10 +561,10 @@
   `IS_USED_IN_PRIMARY` varchar(5) NOT NULL,
   `IS_UNIQUE` varchar(5) NOT NULL,
   `IS_NULLABLE` varchar(5) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table REFERENTIAL_CONSTRAINTS ;
 Table	Create Table
-REFERENTIAL_CONSTRAINTS	CREATE TABLE `referential_constraints` (
+REFERENTIAL_CONSTRAINTS	CREATE TABLE `REFERENTIAL_CONSTRAINTS` (
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL,
   `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
@@ -574,18 +574,18 @@
   `DELETE_RULE` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `REFERENCED_TABLE_NAME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table SCHEMAS ;
 Table	Create Table
-SCHEMAS	CREATE TABLE `schemas` (
+SCHEMAS	CREATE TABLE `SCHEMAS` (
   `SCHEMA_NAME` varchar(256) NOT NULL,
   `DEFAULT_COLLATION_NAME` varchar(256) NOT NULL,
   `SCHEMA_CREATION_TIME` varchar(256) NOT NULL,
   `SCHEMA_UPDATE_TIME` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table TABLES ;
 Table	Create Table
-TABLES	CREATE TABLE `tables` (
+TABLES	CREATE TABLE `TABLES` (
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `TABLE_TYPE` varchar(256) NOT NULL,
@@ -595,16 +595,16 @@
   `TABLE_CREATION_TIME` varchar(256) NOT NULL,
   `TABLE_UPDATE_TIME` varchar(256) NOT NULL,
   `TABLE_COMMENT` varchar(2048) DEFAULT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table TABLE_CONSTRAINTS ;
 Table	Create Table
-TABLE_CONSTRAINTS	CREATE TABLE `table_constraints` (
+TABLE_CONSTRAINTS	CREATE TABLE `TABLE_CONSTRAINTS` (
   `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
   `CONSTRAINT_NAME` varchar(256) NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `CONSTRAINT_TYPE` varchar(256) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 CREATE SCHEMA A;
 use A;
 create table A (a int);

=== modified file 'plugin/schema_dictionary/tests/r/show.result'
--- plugin/schema_dictionary/tests/r/show.result	2010-07-13 07:08:13 +0000
+++ plugin/schema_dictionary/tests/r/show.result	2010-08-17 22:51:53 +0000
@@ -372,7 +372,7 @@
   `branch_id` int NOT NULL DEFAULT '0',
   `project_id` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`branch_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table container;
 Table	Create Table
 container	CREATE TABLE `container` (
@@ -380,14 +380,14 @@
   `context` text,
   `parent_container` int DEFAULT NULL,
   PRIMARY KEY (`container_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=312
 show create table document;
 Table	Create Table
 document	CREATE TABLE `document` (
   `document_id` int NOT NULL AUTO_INCREMENT,
   `doctext` text,
   PRIMARY KEY (`document_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=623
 show create table genstats_attributes;
 Table	Create Table
 genstats_attributes	CREATE TABLE `genstats_attributes` (
@@ -395,14 +395,14 @@
   `predicates` text NOT NULL,
   `attributes` text NOT NULL,
   PRIMARY KEY (`genstats_attributes_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table htmlcode;
 Table	Create Table
 htmlcode	CREATE TABLE `htmlcode` (
   `htmlcode_id` int NOT NULL AUTO_INCREMENT,
   `code` text,
   PRIMARY KEY (`htmlcode_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=516
 show create table htmlpage;
 Table	Create Table
 htmlpage	CREATE TABLE `htmlpage` (
@@ -415,7 +415,7 @@
   `permissionneeded` varchar(1) NOT NULL DEFAULT 'r',
   `MIMEtype` varchar(255) NOT NULL DEFAULT 'text/html',
   PRIMARY KEY (`htmlpage_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=564
 show create table image;
 Table	Create Table
 image	CREATE TABLE `image` (
@@ -425,7 +425,7 @@
   `thumbsrc` varchar(255) DEFAULT NULL,
   `description` text,
   PRIMARY KEY (`image_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=138
 show create table javascript;
 Table	Create Table
 javascript	CREATE TABLE `javascript` (
@@ -434,7 +434,7 @@
   `comment` text NOT NULL,
   `dynamic` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`javascript_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table knowledge_item;
 Table	Create Table
 knowledge_item	CREATE TABLE `knowledge_item` (
@@ -442,7 +442,7 @@
   `item` text NOT NULL,
   `question` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`knowledge_item_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table links;
 Table	Create Table
 links	CREATE TABLE `links` (
@@ -452,7 +452,7 @@
   `hits` int DEFAULT '0',
   `food` int DEFAULT '0',
   PRIMARY KEY (`from_node`,`to_node`,`linktype`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table mail;
 Table	Create Table
 mail	CREATE TABLE `mail` (
@@ -460,7 +460,7 @@
   `from_address` varchar(80) NOT NULL DEFAULT '',
   `attachment_file` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`mail_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table node;
 Table	Create Table
 node	CREATE TABLE `node` (
@@ -488,7 +488,7 @@
   KEY `title` (`title`,`type_nodetype`),
   KEY `author` (`author_user`),
   KEY `type` (`type_nodetype`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=641
 show create table nodegroup;
 Table	Create Table
 nodegroup	CREATE TABLE `nodegroup` (
@@ -497,7 +497,7 @@
   `node_id` int NOT NULL DEFAULT '0',
   `orderby` int DEFAULT NULL,
   PRIMARY KEY (`nodegroup_id`,`rank`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=624
 show create table nodelet;
 Table	Create Table
 nodelet	CREATE TABLE `nodelet` (
@@ -510,7 +510,7 @@
   `updateinterval` int NOT NULL DEFAULT '0',
   `mini_nodelet` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`nodelet_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=495
 show create table nodemethod;
 Table	Create Table
 nodemethod	CREATE TABLE `nodemethod` (
@@ -518,7 +518,7 @@
   `supports_nodetype` int NOT NULL DEFAULT '0',
   `code` text NOT NULL,
   PRIMARY KEY (`nodemethod_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table nodetype;
 Table	Create Table
 nodetype	CREATE TABLE `nodetype` (
@@ -540,7 +540,7 @@
   `maxrevisions` int NOT NULL DEFAULT '-1',
   `canworkspace` int NOT NULL DEFAULT '-1',
   PRIMARY KEY (`nodetype_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=561
 show create table project;
 Table	Create Table
 project	CREATE TABLE `project` (
@@ -552,14 +552,14 @@
   `url_faq` varchar(250) NOT NULL DEFAULT '',
   `long_description` text NOT NULL,
   PRIMARY KEY (`project_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table project_document;
 Table	Create Table
 project_document	CREATE TABLE `project_document` (
   `project_document_id` int NOT NULL DEFAULT '0',
   `project_id` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`project_document_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table question;
 Table	Create Table
 question	CREATE TABLE `question` (
@@ -570,14 +570,14 @@
   `orderby` int NOT NULL DEFAULT '0',
   `description` text NOT NULL,
   PRIMARY KEY (`question_id`,`rank`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table redirects;
 Table	Create Table
 redirects	CREATE TABLE `redirects` (
   `redirects_id` int NOT NULL DEFAULT '0',
   `url` text NOT NULL,
   PRIMARY KEY (`redirects_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table releases;
 Table	Create Table
 releases	CREATE TABLE `releases` (
@@ -592,7 +592,7 @@
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `url_source_rpm` varchar(250) NOT NULL,
   PRIMARY KEY (`releases_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table revision;
 Table	Create Table
 revision	CREATE TABLE `revision` (
@@ -602,35 +602,35 @@
   `xml` text NOT NULL,
   `tstamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`node_id`,`inside_workspace`,`revision_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table setting;
 Table	Create Table
 setting	CREATE TABLE `setting` (
   `setting_id` int NOT NULL AUTO_INCREMENT,
   `vars` text NOT NULL,
   PRIMARY KEY (`setting_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=623
 show create table symlink;
 Table	Create Table
 symlink	CREATE TABLE `symlink` (
   `symlink_id` int NOT NULL DEFAULT '0',
   `symlink_node` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`symlink_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table themesetting;
 Table	Create Table
 themesetting	CREATE TABLE `themesetting` (
   `themesetting_id` int NOT NULL DEFAULT '0',
   `parent_theme` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`themesetting_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table typeversion;
 Table	Create Table
 typeversion	CREATE TABLE `typeversion` (
   `typeversion_id` int NOT NULL DEFAULT '0',
   `version` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`typeversion_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table user;
 Table	Create Table
 user	CREATE TABLE `user` (
@@ -643,14 +643,14 @@
   `karma` int DEFAULT '0',
   `inside_workspace` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`user_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=623
 show create table version;
 Table	Create Table
 version	CREATE TABLE `version` (
   `version_id` int NOT NULL DEFAULT '0',
   `version` int NOT NULL DEFAULT '1',
   PRIMARY KEY (`version_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table weblog;
 Table	Create Table
 weblog	CREATE TABLE `weblog` (
@@ -663,13 +663,13 @@
   `entry_id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`entry_id`),
   KEY `tstamp` (`tstamp`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table workspace;
 Table	Create Table
 workspace	CREATE TABLE `workspace` (
   `workspace_id` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`workspace_id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show columns from branch;
 Field	Type	Null	Default	Default_is_NULL	On_Update
 branch_id	INTEGER	NO	0	NO	

=== modified file 'plugin/schema_dictionary/tests/r/show_fields.result'
--- plugin/schema_dictionary/tests/r/show_fields.result	2010-07-12 06:26:42 +0000
+++ plugin/schema_dictionary/tests/r/show_fields.result	2010-08-17 22:51:53 +0000
@@ -7,7 +7,7 @@
 a	CREATE TABLE `a` (
   `a` bigint NOT NULL AUTO_INCREMENT,
   UNIQUE KEY `a` (`a`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create table b ( b int);
 show fields from b;
 Field	Type	Null	Default	Default_is_NULL	On_Update
@@ -16,7 +16,7 @@
 Table	Create Table
 b	CREATE TABLE `b` (
   `b` int DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create table c ( b int NOT NULL);
 show fields from c;
 Field	Type	Null	Default	Default_is_NULL	On_Update
@@ -25,7 +25,7 @@
 Table	Create Table
 c	CREATE TABLE `c` (
   `b` int NOT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create table d ( b int NOT NULL DEFAULT 10);
 show fields from d;
 Field	Type	Null	Default	Default_is_NULL	On_Update
@@ -34,7 +34,7 @@
 Table	Create Table
 d	CREATE TABLE `d` (
   `b` int NOT NULL DEFAULT '10'
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create table e ( b int DEFAULT NULL);
 show fields from e;
 Field	Type	Null	Default	Default_is_NULL	On_Update
@@ -43,5 +43,5 @@
 Table	Create Table
 e	CREATE TABLE `e` (
   `b` int DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop tables a,b,c,d,e;

=== modified file 'plugin/session_dictionary/tests/r/data_dictionary.result'
--- plugin/session_dictionary/tests/r/data_dictionary.result	2010-07-02 03:52:23 +0000
+++ plugin/session_dictionary/tests/r/data_dictionary.result	2010-08-17 22:51:53 +0000
@@ -1,7 +1,7 @@
 use data_dictionary;
 show create table PROCESSLIST ;
 Table	Create Table
-PROCESSLIST	CREATE TABLE `processlist` (
+PROCESSLIST	CREATE TABLE `PROCESSLIST` (
   `ID` bigint NOT NULL,
   `USER` varchar(16) NOT NULL,
   `HOST` varchar(1025) NOT NULL,
@@ -10,7 +10,7 @@
   `TIME` bigint NOT NULL,
   `STATE` varchar(256) NOT NULL,
   `INFO` varchar(100) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SELECT ID FROM processlist;
 ID
 #

=== modified file 'plugin/status_dictionary/tests/r/data_dictionary.result'
--- plugin/status_dictionary/tests/r/data_dictionary.result	2010-07-02 03:52:23 +0000
+++ plugin/status_dictionary/tests/r/data_dictionary.result	2010-08-17 22:51:53 +0000
@@ -1,28 +1,28 @@
 use data_dictionary;
 show create table GLOBAL_STATUS ;
 Table	Create Table
-GLOBAL_STATUS	CREATE TABLE `global_status` (
+GLOBAL_STATUS	CREATE TABLE `GLOBAL_STATUS` (
   `VARIABLE_NAME` varchar(256) NOT NULL,
   `VARIABLE_VALUE` varchar(1024) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table GLOBAL_VARIABLES ;
 Table	Create Table
-GLOBAL_VARIABLES	CREATE TABLE `global_variables` (
+GLOBAL_VARIABLES	CREATE TABLE `GLOBAL_VARIABLES` (
   `VARIABLE_NAME` varchar(256) NOT NULL,
   `VARIABLE_VALUE` varchar(1024) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table SESSION_STATUS;
 Table	Create Table
-SESSION_STATUS	CREATE TABLE `session_status` (
+SESSION_STATUS	CREATE TABLE `SESSION_STATUS` (
   `VARIABLE_NAME` varchar(256) NOT NULL,
   `VARIABLE_VALUE` varchar(1024) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 show create table SESSION_VARIABLES;
 Table	Create Table
-SESSION_VARIABLES	CREATE TABLE `session_variables` (
+SESSION_VARIABLES	CREATE TABLE `SESSION_VARIABLES` (
   `VARIABLE_NAME` varchar(256) NOT NULL,
   `VARIABLE_VALUE` varchar(1024) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SELECT count(*) FROM data_dictionary.GLOBAL_STATUS;
 count(*)
 #

=== modified file 'plugin/table_cache_dictionary/tests/r/table_cache.result'
--- plugin/table_cache_dictionary/tests/r/table_cache.result	2010-07-02 03:52:23 +0000
+++ plugin/table_cache_dictionary/tests/r/table_cache.result	2010-08-17 22:51:53 +0000
@@ -1,6 +1,6 @@
 show create table data_dictionary.TABLE_CACHE;
 Table	Create Table
-TABLE_CACHE	CREATE TABLE `table_cache` (
+TABLE_CACHE	CREATE TABLE `TABLE_CACHE` (
   `SESSION_ID` bigint NOT NULL,
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
@@ -10,7 +10,7 @@
   `AVG_ROW_LENGTH` bigint NOT NULL,
   `TABLE_SIZE` bigint NOT NULL,
   `AUTO_INCREMENT` bigint NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 select count(*) FROM data_dictionary.TABLE_CACHE;
 count(*)
 #

=== modified file 'plugin/table_cache_dictionary/tests/r/table_definition_cache.result'
--- plugin/table_cache_dictionary/tests/r/table_definition_cache.result	2010-07-02 03:52:23 +0000
+++ plugin/table_cache_dictionary/tests/r/table_definition_cache.result	2010-08-17 22:51:53 +0000
@@ -1,12 +1,12 @@
 show create table data_dictionary.TABLE_DEFINITION_CACHE;
 Table	Create Table
-TABLE_DEFINITION_CACHE	CREATE TABLE `table_definition_cache` (
+TABLE_DEFINITION_CACHE	CREATE TABLE `TABLE_DEFINITION_CACHE` (
   `TABLE_SCHEMA` varchar(256) NOT NULL,
   `TABLE_NAME` varchar(256) NOT NULL,
   `VERSION` bigint NOT NULL,
   `TABLE_COUNT` bigint NOT NULL,
   `IS_NAME_LOCKED` varchar(5) NOT NULL
-) ENGINE=FunctionEngine
+) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 select count(*) FROM data_dictionary.TABLE_DEFINITION_CACHE;
 count(*)
 #

=== modified file 'plugin/transaction_log/tests/r/alter.result'
--- plugin/transaction_log/tests/r/alter.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/alter.result	2010-08-17 22:51:53 +0000
@@ -13,7 +13,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/auto_commit.result'
--- plugin/transaction_log/tests/r/auto_commit.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/auto_commit.result	2010-08-17 22:51:53 +0000
@@ -19,7 +19,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -29,7 +29,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/blob.result'
--- plugin/transaction_log/tests/r/blob.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/blob.result	2010-08-17 22:51:53 +0000
@@ -13,7 +13,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` BLOB NOT NULL COLLATE binary, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` blob NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'test\0me');

=== modified file 'plugin/transaction_log/tests/r/create_select.result'
--- plugin/transaction_log/tests/r/create_select.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/create_select.result	2010-08-17 22:51:53 +0000
@@ -18,7 +18,7 @@
 DROP TABLE IF EXISTS `test`.`t2`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -27,7 +27,7 @@
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t2` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t2` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t2` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/create_table.result'
--- plugin/transaction_log/tests/r/create_table.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/create_table.result	2010-08-17 22:51:53 +0000
@@ -40,13 +40,13 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `autoinc_int_field` INT NOT NULL AUTO_INCREMENT, `null_int_field` INT NULL, `not_null_bigint_field` BIGINT NOT NULL, `null_bigint_field` BIGINT NULL, `not_null_int_field` INT NOT NULL, `null_varchar_field` VARCHAR(100) NULL COLLATE utf8_general_ci, `not_null_varchar_field` VARCHAR(100) NOT NULL COLLATE utf8_general_ci, `null_enum_field` ENUM('val1','val2') NULL, `not_null_enum_field` ENUM('val1','val2') NOT NULL, `null_date_field` DATE NULL, `not_null_date_field` DATE NOT NULL, `null_datetime_field` DATETIME NULL, `not_null_datetime_field` DATETIME NOT NULL, `null_blob_field` BLOB NULL COLLATE binary, `not_null_blob_field` BLOB NOT NULL COLLATE binary, `null_text_field` BLOB NULL COLLATE utf8_general_ci, `not_null_text_field` BLOB NOT NULL COLLATE utf8_general_ci, `null_timestamp_field` TIMESTAMP NULL, `not_null_timestamp_field` TIMESTAMP NOT NULL, `null_double_field` DOUBLE NULL, `not_null_double_field` DOUBLE NOT NULL, `null_decimal_field` DECIMAL(10,2) NULL, `not_null_decimal_field` DECIMAL(10,2) NOT NULL, PRIMARY KEY `PRIMARY` (`autoinc_int_field`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `autoinc_int_field` int NOT NULL AUTO_INCREMENT,   `null_int_field` int DEFAULT NULL,   `not_null_bigint_field` bigint NOT NULL,   `null_bigint_field` bigint DEFAULT NULL,   `not_null_int_field` int NOT NULL,   `null_varchar_field` varchar(100) DEFAULT NULL,   `not_null_varchar_field` varchar(100) NOT NULL,   `null_enum_field` enum('val1','val2') DEFAULT NULL,   `not_null_enum_field` enum('val1','val2') NOT NULL,   `null_date_field` date DEFAULT NULL,   `not_null_date_field` date NOT NULL,   `null_datetime_field` datetime DEFAULT NULL,   `not_null_datetime_field` datetime NOT NULL,   `null_blob_field` blob,   `not_null_blob_field` blob NOT NULL,   `null_text_field` text,   `not_null_text_field` text NOT NULL,   `null_timestamp_field` timestamp NULL DEFAULT NULL,   `not_null_timestamp_field` timestamp NOT NULL,   `null_double_field` double DEFAULT NULL,   `not_null_double_field` double NOT NULL,   `null_decimal_field` decimal(10,2) DEFAULT NULL,   `not_null_decimal_field` decimal(10,2) NOT NULL,   PRIMARY KEY (`autoinc_int_field`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL AUTO_INCREMENT, `key1` VARCHAR(10) NOT NULL COLLATE utf8_general_ci, `key2` DOUBLE NOT NULL, `key3` BLOB NOT NULL COLLATE binary, PRIMARY KEY `PRIMARY` (`id`), UNIQUE KEY `key1` (`key1`), KEY `named_key` (`key2`), KEY `partial_key` (`key3`(30)) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL AUTO_INCREMENT,   `key1` varchar(10) NOT NULL,   `key2` double NOT NULL,   `key3` blob NOT NULL,   PRIMARY KEY (`id`),   UNIQUE KEY `key1` (`key1`),   KEY `named_key` (`key2`),   KEY `partial_key` (`key3`(30)) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 DROP TABLE `test`.`t1`;

=== modified file 'plugin/transaction_log/tests/r/delete.result'
--- plugin/transaction_log/tests/r/delete.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/delete.result	2010-08-17 22:51:53 +0000
@@ -40,7 +40,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -55,7 +55,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `other` INT NOT NULL, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `other` int NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`other`) VALUES (1,1);
@@ -95,7 +95,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/filtered_replicator.result'
--- plugin/transaction_log/tests/r/filtered_replicator.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/filtered_replicator.result	2010-08-17 22:51:53 +0000
@@ -126,7 +126,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -141,29 +141,29 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-DROP TABLE IF EXISTS `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-DROP TABLE IF EXISTS `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
+COMMIT;
+START TRANSACTION;
+INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
+INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
+COMMIT;
+START TRANSACTION;
+DROP TABLE IF EXISTS `test`.`t1`;
+COMMIT;
+START TRANSACTION;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
+COMMIT;
+START TRANSACTION;
+INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
+COMMIT;
+START TRANSACTION;
+INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
+COMMIT;
+START TRANSACTION;
+DROP TABLE IF EXISTS `test`.`t1`;
+COMMIT;
+START TRANSACTION;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -193,7 +193,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 RENAME TABLE t1 TO t2;
@@ -202,7 +202,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -217,7 +217,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `other` INT NOT NULL, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `other` int NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`other`) VALUES (1,1);
@@ -257,7 +257,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -271,7 +271,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -290,7 +290,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL AUTO_INCREMENT, `name` VARCHAR(1024) NOT NULL COLLATE utf8_general_ci, `alias` VARCHAR(1024) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL AUTO_INCREMENT,   `name` varchar(1024) DEFAULT NULL,   `alias` varchar(1024) DEFAULT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`name`,`alias`) VALUES (1,'jeff lebowski','dude');
@@ -302,7 +302,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `counter` INT NOT NULL, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `counter` int NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`counter`) VALUES (1,1);
@@ -320,7 +320,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/insert.result'
--- plugin/transaction_log/tests/r/insert.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/insert.result	2010-08-17 22:51:53 +0000
@@ -10,7 +10,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/insert_multi.result'
--- plugin/transaction_log/tests/r/insert_multi.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/insert_multi.result	2010-08-17 22:51:53 +0000
@@ -8,7 +8,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/insert_on_duplicate_update.result'
--- plugin/transaction_log/tests/r/insert_on_duplicate_update.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/insert_on_duplicate_update.result	2010-08-17 22:51:53 +0000
@@ -12,7 +12,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL AUTO_INCREMENT, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL AUTO_INCREMENT,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/insert_select.result'
--- plugin/transaction_log/tests/r/insert_select.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/insert_select.result	2010-08-17 22:51:53 +0000
@@ -18,7 +18,7 @@
 DROP TABLE IF EXISTS `test`.`t2`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -27,7 +27,7 @@
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t2` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t2` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t2` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/multi_column_primary_key.result'
--- plugin/transaction_log/tests/r/multi_column_primary_key.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/multi_column_primary_key.result	2010-08-17 22:51:53 +0000
@@ -18,7 +18,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `k1` INT NOT NULL, `k2` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`k1`,`k2`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `k1` int NOT NULL,   `k2` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`k1`,`k2`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`k1`,`k2`,`padding`) VALUES (1,1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/multi_table.result'
--- plugin/transaction_log/tests/r/multi_table.result	2010-07-21 03:20:34 +0000
+++ plugin/transaction_log/tests/r/multi_table.result	2010-08-17 22:51:53 +0000
@@ -25,10 +25,10 @@
 DROP TABLE IF EXISTS `test`.`t2`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t2` ( `id` INT NOT NULL, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t2` (   `id` int NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`) VALUES (1);

=== modified file 'plugin/transaction_log/tests/r/no_modification.result'
--- plugin/transaction_log/tests/r/no_modification.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/no_modification.result	2010-08-17 22:51:53 +0000
@@ -18,7 +18,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/no_primary_key.result'
--- plugin/transaction_log/tests/r/no_primary_key.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/no_primary_key.result	2010-08-17 22:51:53 +0000
@@ -10,7 +10,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 DROP TABLE `test`.`t1`;

=== modified file 'plugin/transaction_log/tests/r/null_values.result'
--- plugin/transaction_log/tests/r/null_values.result	2010-07-28 02:04:26 +0000
+++ plugin/transaction_log/tests/r/null_values.result	2010-08-17 22:51:53 +0000
@@ -24,7 +24,7 @@
 DROP TABLE IF EXISTS `test`.`t3`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `a` INT NOT NULL, `b` VARCHAR(1000) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`a`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `a` int NOT NULL,   `b` varchar(1000) DEFAULT NULL,   PRIMARY KEY (`a`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`a`,`b`) VALUES (1,'update me');
@@ -49,7 +49,7 @@
 DELETE FROM `test`.`t1` WHERE `a`=4;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t2` ( `a` INT NOT NULL AUTO_INCREMENT, `b` INT NOT NULL, PRIMARY KEY `PRIMARY` (`a`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t2` (   `a` int NOT NULL AUTO_INCREMENT,   `b` int DEFAULT NULL,   PRIMARY KEY (`a`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t2` (`a`,`b`) VALUES (1,NULL);
@@ -58,7 +58,7 @@
 INSERT INTO `test`.`t2` (`a`,`b`) VALUES (2,0);
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t3` ( `a` INT NOT NULL, `b` ENUM('1','2') NOT NULL, PRIMARY KEY `PRIMARY` (`a`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t3` (   `a` int NOT NULL,   `b` enum('1','2') DEFAULT NULL,   PRIMARY KEY (`a`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t3` (`a`,`b`) VALUES (1,1);

=== modified file 'plugin/transaction_log/tests/r/rand.result'
--- plugin/transaction_log/tests/r/rand.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/rand.result	2010-08-17 22:51:53 +0000
@@ -10,7 +10,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`) VALUES (1);

=== modified file 'plugin/transaction_log/tests/r/rename.result'
--- plugin/transaction_log/tests/r/rename.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/rename.result	2010-08-17 22:51:53 +0000
@@ -12,7 +12,7 @@
 DROP TABLE IF EXISTS `test`.`t2`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 RENAME TABLE t1 TO t2;

=== modified file 'plugin/transaction_log/tests/r/replace.result'
--- plugin/transaction_log/tests/r/replace.result	2010-07-19 23:44:13 +0000
+++ plugin/transaction_log/tests/r/replace.result	2010-08-17 22:51:53 +0000
@@ -27,7 +27,7 @@
 DROP TABLE IF EXISTS `test`.`t2`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL AUTO_INCREMENT, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL AUTO_INCREMENT,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -42,10 +42,10 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL AUTO_INCREMENT, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL AUTO_INCREMENT,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t2` ( `id` INT NOT NULL AUTO_INCREMENT, `fk_id` INT NOT NULL, PRIMARY KEY `PRIMARY` (`id`), KEY `fk_t1` (`fk_id`),   CONSTRAINT `fk_t1` FOREIGN KEY (`fk_id`) REFERENCES `t1` (`id`) ON DELETE CASCADE ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t2` (   `id` int NOT NULL AUTO_INCREMENT,   `fk_id` int NOT NULL,   PRIMARY KEY (`id`),   KEY `fk_t1` (`fk_id`),   CONSTRAINT `fk_t1` FOREIGN KEY (`fk_id`) REFERENCES `t1` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/rollback.result'
--- plugin/transaction_log/tests/r/rollback.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/rollback.result	2010-08-17 22:51:53 +0000
@@ -16,7 +16,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 DROP TABLE `test`.`t1`;

=== modified file 'plugin/transaction_log/tests/r/select_for_update.result'
--- plugin/transaction_log/tests/r/select_for_update.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/select_for_update.result	2010-08-17 22:51:53 +0000
@@ -22,7 +22,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/temp_tables.result'
--- plugin/transaction_log/tests/r/temp_tables.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/temp_tables.result	2010-08-17 22:51:53 +0000
@@ -16,7 +16,7 @@
 DROP TABLE IF EXISTS `test`.`t2`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t2` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t2` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t2` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/truncate.result'
--- plugin/transaction_log/tests/r/truncate.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/truncate.result	2010-08-17 22:51:53 +0000
@@ -10,7 +10,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'plugin/transaction_log/tests/r/update.result'
--- plugin/transaction_log/tests/r/update.result	2010-07-19 23:43:11 +0000
+++ plugin/transaction_log/tests/r/update.result	2010-08-17 22:51:53 +0000
@@ -39,7 +39,7 @@
 DROP TABLE IF EXISTS `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
@@ -58,7 +58,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL AUTO_INCREMENT, `name` VARCHAR(1024) NOT NULL COLLATE utf8_general_ci, `alias` VARCHAR(1024) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL AUTO_INCREMENT,   `name` varchar(1024) DEFAULT NULL,   `alias` varchar(1024) DEFAULT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`name`,`alias`) VALUES (1,'jeff lebowski','dude');
@@ -70,7 +70,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `counter` INT NOT NULL, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `counter` int NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`counter`) VALUES (1,1);
@@ -88,7 +88,7 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 START TRANSACTION;
-CREATE TABLE `test`.`t1` ( `id` INT NOT NULL, `padding` VARCHAR(200) NOT NULL COLLATE utf8_general_ci, PRIMARY KEY `PRIMARY` (`id`) ) ENGINE = InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `test`.`t1` (   `id` int NOT NULL,   `padding` varchar(200) NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 COMMIT;
 START TRANSACTION;
 INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');

=== modified file 'tests/r/alter_table.result'
--- tests/r/alter_table.result	2010-07-12 06:26:42 +0000
+++ tests/r/alter_table.result	2010-08-17 22:51:53 +0000
@@ -176,7 +176,7 @@
 alter table t2 rename t1, add c char(10) comment "no comment";
 show columns from t1;
 Field	Type	Null	Default	Default_is_NULL	On_Update
-i	INTEGER	NO	0	NO	
+i	INTEGER	NO		NO	
 c	VARCHAR	YES		YES	
 drop table t1;
 create table t1 (a int, b int);
@@ -356,7 +356,7 @@
   `a` int NOT NULL,
   `b` int DEFAULT NULL,
   UNIQUE KEY `b` (`b`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 ALTER TABLE t1 DROP PRIMARY KEY;
 ERROR 42000: Can't DROP 'PRIMARY'; check that column/key exists
 DROP TABLE t1;
@@ -527,13 +527,13 @@
 t1	CREATE TABLE `t1` (
   `a` int DEFAULT NULL,
   KEY `i1` (`a`)
-) ENGINE=DEFAULT ROW_FORMAT='COMPACT'
+) ENGINE=DEFAULT ROW_FORMAT='COMPACT' COLLATE = utf8_general_ci
 DROP INDEX i1 ON t1;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=DEFAULT ROW_FORMAT='COMPACT'
+) ENGINE=DEFAULT ROW_FORMAT='COMPACT' COLLATE = utf8_general_ci
 DROP TABLE t1;
 DROP TABLE IF EXISTS bug24219;
 DROP TABLE IF EXISTS bug24219_2;
@@ -800,12 +800,12 @@
 Table	Create Table
 tt+1	CREATE TEMPORARY TABLE `tt+1` (
   `c1` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 SHOW CREATE TABLE `tt+2`;
 Table	Create Table
 tt+2	CREATE TEMPORARY TABLE `tt+2` (
   `c1` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 DROP TABLE   `tt+1`, `tt+2`;
 CREATE TEMPORARY TABLE `#sql1` (c1 INT);
 CREATE TEMPORARY TABLE `@0023sql2` (c1 INT);
@@ -825,12 +825,12 @@
 Table	Create Table
 #sql2	CREATE TEMPORARY TABLE `#sql2` (
   `c1` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 SHOW CREATE TABLE `@0023sql1`;
 Table	Create Table
 @0023sql1	CREATE TEMPORARY TABLE `@0023sql1` (
   `c1` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 DROP TABLE `#sql2`, `@0023sql1`;
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;

=== modified file 'tests/r/auto_increment.result'
--- tests/r/auto_increment.result	2010-06-07 06:04:12 +0000
+++ tests/r/auto_increment.result	2010-08-17 22:51:53 +0000
@@ -292,7 +292,7 @@
   `t1_id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`t1_id`),
   KEY `t1_name` (`t1_name`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=1000
 DROP TABLE `t1`;
 create table t1(a int not null auto_increment primary key);
 create table t2(a int not null auto_increment primary key, t1a int);

=== modified file 'tests/r/bigint.result'
--- tests/r/bigint.result	2010-07-12 06:26:42 +0000
+++ tests/r/bigint.result	2010-08-17 22:51:53 +0000
@@ -169,14 +169,14 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int NOT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t1 select 9223372036854775809 as 'a';
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` bigint NOT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 select * from t1;
 a
 -9223372036854775807

=== modified file 'tests/r/binary.result'
--- tests/r/binary.result	2009-11-13 00:56:59 +0000
+++ tests/r/binary.result	2010-08-17 22:51:53 +0000
@@ -92,7 +92,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(1) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t2 (a varbinary);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your Drizzle server version for the right syntax to use near ')' at line 1

=== modified file 'tests/r/case.result'
--- tests/r/case.result	2010-03-22 19:44:37 +0000
+++ tests/r/case.result	2010-08-17 22:51:53 +0000
@@ -118,7 +118,7 @@
   `c10` double NOT NULL,
   `c11` double NOT NULL,
   `c12` varbinary(5) NOT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 DROP TABLE t1;
 SELECT CASE 
 WHEN 1 
@@ -163,7 +163,7 @@
   `COALESCE(1,'1')` varbinary(4) NOT NULL,
   `COALESCE(1.1,'1')` varbinary(4) NOT NULL,
   `COALESCE('a' COLLATE utf8_bin,'b')` varchar(1) COLLATE utf8_bin DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 DROP TABLE t1;
 SELECT 'case+union+test'
 UNION 

=== modified file 'tests/r/comment_column.result'
--- tests/r/comment_column.result	2010-05-26 21:49:18 +0000
+++ tests/r/comment_column.result	2010-08-17 22:51:53 +0000
@@ -29,7 +29,7 @@
   `c7` int DEFAULT NULL,
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD COLUMN c8 INTEGER COMMENT 'ABCdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -61,7 +61,7 @@
   `c8` int DEFAULT NULL COMMENT 'ABCdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD COLUMN c9 INTEGER COMMENT 'ABCDefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -95,7 +95,7 @@
   `c9` int DEFAULT NULL COMMENT 'ABCDefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD COLUMN c10 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -131,7 +131,7 @@
   `c10` int DEFAULT NULL COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 MODIFY COLUMN c8 CHAR(10);
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -167,7 +167,7 @@
   `c10` int DEFAULT NULL COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 CHANGE COLUMN c9 c9_1 INTEGER COMMENT '1234567890';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -203,7 +203,7 @@
   `c10` int DEFAULT NULL COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 DROP COLUMN c1;
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -235,7 +235,7 @@
   `c9_1` int DEFAULT NULL COMMENT '1234567890',
   `c10` int DEFAULT NULL COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD COLUMN c11 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 ERROR HY000: String 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for COLUMN COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
@@ -268,7 +268,7 @@
   `c9_1` int DEFAULT NULL COMMENT '1234567890',
   `c10` int DEFAULT NULL COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD COLUMN c12 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 ERROR HY000: String 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for COLUMN COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
@@ -301,7 +301,7 @@
   `c9_1` int DEFAULT NULL COMMENT '1234567890',
   `c10` int DEFAULT NULL COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD COLUMN c12 CHAR(100) COMMENT 'ABCDefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -335,7 +335,7 @@
   `c10` int DEFAULT NULL COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   `c12` varchar(100) DEFAULT NULL COMMENT 'ABCDefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 drop table t1;
 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'Abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd', c2 INTEGER COMMENT 'aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdaBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2) 
 ) COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';

=== modified file 'tests/r/comment_index.result'
--- tests/r/comment_index.result	2010-05-26 21:49:18 +0000
+++ tests/r/comment_index.result	2010-08-17 22:51:53 +0000
@@ -41,7 +41,7 @@
   `c13` datetime DEFAULT NULL,
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 CREATE INDEX i4 ON t1(c4) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -85,7 +85,7 @@
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`),
   KEY `i4` (`c4`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD INDEX (c6) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -131,7 +131,7 @@
   KEY `i2` (`c2`),
   KEY `i4` (`c4`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `c6` (`c6`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 DROP INDEX i1 ON t1;
 ALTER TABLE t1 DROP INDEX i2, DROP INDEX i4;
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
@@ -172,7 +172,7 @@
   `c12` datetime DEFAULT NULL,
   `c13` datetime DEFAULT NULL,
   KEY `c6` (`c6`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD INDEX i8(c8) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd', ADD INDEX i10(c10) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -216,7 +216,7 @@
   KEY `c6` (`c6`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i8` (`c8`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i10` (`c10`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 CREATE INDEX i1_3 ON t1(c1,c2,c3) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
@@ -262,7 +262,7 @@
   KEY `i8` (`c8`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i10` (`c10`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1_3` (`c1`,`c2`,`c3`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 CREATE INDEX i11 ON t1(c11) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 ERROR HY000: String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
@@ -309,7 +309,7 @@
   KEY `i8` (`c8`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i10` (`c10`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1_3` (`c1`,`c2`,`c3`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD INDEX (c13) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 ERROR HY000: String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
@@ -356,7 +356,7 @@
   KEY `i8` (`c8`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i10` (`c10`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1_3` (`c1`,`c2`,`c3`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 ALTER TABLE t1 ADD INDEX i12 (c12) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 ERROR HY000: String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
@@ -403,7 +403,7 @@
   KEY `i8` (`c8`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i10` (`c10`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1_3` (`c1`,`c2`,`c3`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 CREATE INDEX i12 ON t1(c12) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 ERROR HY000: String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
@@ -450,5 +450,5 @@
   KEY `i8` (`c8`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i10` (`c10`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',
   KEY `i1_3` (`c1`,`c2`,`c3`) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
-) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 DROP TABLE t1;

=== modified file 'tests/r/comment_table.result'
--- tests/r/comment_table.result	2010-05-26 21:49:18 +0000
+++ tests/r/comment_table.result	2010-08-17 22:51:53 +0000
@@ -28,7 +28,7 @@
   `c7` int DEFAULT NULL,
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 drop table t1;
 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'c1 comment', c2 INTEGER,c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2) 
 ) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde';
@@ -56,7 +56,7 @@
   `c7` int DEFAULT NULL,
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde'
+) ENGINE=ENGINE COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde' COLLATE = utf8_general_ci
 drop table t1;
 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'c1 comment', c2 INTEGER,c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2) 
 ) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde';
@@ -99,7 +99,7 @@
   `c7` int DEFAULT NULL,
   KEY `i1` (`c1`) COMMENT 'i1 comment',
   KEY `i2` (`c2`)
-) ENGINE=ENGINE COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
+) ENGINE=ENGINE COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd' COLLATE = utf8_general_ci
 drop table t1;
 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'c1 comment', c2 INTEGER,c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2) 
 ) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde';

=== modified file 'tests/r/constraints.result'
--- tests/r/constraints.result	2010-04-05 23:46:43 +0000
+++ tests/r/constraints.result	2010-08-17 22:51:53 +0000
@@ -25,5 +25,5 @@
   UNIQUE KEY `constraint_1` (`a`),
   UNIQUE KEY `key_1` (`a`),
   UNIQUE KEY `key_2` (`a`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;

=== modified file 'tests/r/create.result'
--- tests/r/create.result	2010-07-13 07:12:02 +0000
+++ tests/r/create.result	2010-08-17 22:51:53 +0000
@@ -42,18 +42,18 @@
 Table	Create Table
 a/a	CREATE TABLE `a/a` (
   `a` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 create table t1 like `a/a`;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 show create table `t1`;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table `a/a`;
 drop table `t1`;
 create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa int);
@@ -210,7 +210,7 @@
   KEY `b_29` (`b`),
   KEY `b_30` (`b`),
   KEY `b_31` (`b`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t1 select if(1,'1','0'), month("2002-08-02");
 drop table t1;
@@ -228,7 +228,7 @@
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int NOT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 drop table t1;
 SET SESSION storage_engine="gemini";
 ERROR 42000: Unknown table engine 'gemini'
@@ -240,7 +240,7 @@
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int NOT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 SET SESSION storage_engine=default;
 drop table t1;
 create table t1 ( k1 varchar(2), k2 int, primary key(k1,k2));
@@ -316,7 +316,7 @@
 t3	CREATE TABLE `t3` (
   `id` int NOT NULL,
   `name` varchar(20) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 select * from t3;
 id	name
 create table if not exists t3 like t1;
@@ -330,7 +330,7 @@
 Table	Create Table
 t3	CREATE TEMPORARY TABLE `t3` (
   `id` int NOT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 select * from t3;
 id
 drop table t3;
@@ -339,7 +339,7 @@
 t3	CREATE TABLE `t3` (
   `id` int NOT NULL,
   `name` varchar(20) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 select * from t3;
 id	name
 drop table t2, t3;
@@ -351,14 +351,14 @@
 t3	CREATE TEMPORARY TABLE `t3` (
   `id` int NOT NULL,
   `name` varchar(20) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 create table t2 like t3;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `id` int NOT NULL,
   `name` varchar(20) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 select * from t2;
 id	name
 create table t3 like t1;
@@ -382,7 +382,7 @@
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int NOT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 drop table t1;
 SET SESSION storage_engine="gemini";
 ERROR 42000: Unknown table engine 'gemini'
@@ -394,7 +394,7 @@
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int NOT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 SET SESSION storage_engine=default;
 drop table t1;
 create table t1(a int,b int,c int,d date,e char,f datetime,h blob);
@@ -457,7 +457,7 @@
   `ifnull(l,l)` datetime DEFAULT NULL,
   `ifnull(m,m)` varchar(1) DEFAULT NULL,
   `ifnull(o,o)` varchar(10) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1,t2;
 create table t1(str varchar(10) default 'def',strnull varchar(10),intg int default '10',rel double default '3.14');
 insert into t1 values ('','',0,0.0);
@@ -568,7 +568,7 @@
 t1	CREATE TABLE `t1` (
   `a` varchar(112) COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 CREATE TABLE t2 (
 a int default NULL
@@ -584,7 +584,7 @@
   `a` varchar(12) COLLATE utf8_bin NOT NULL,
   `b` int NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t1 ( 
 a varchar(12) collate utf8_bin not null, 
@@ -602,7 +602,7 @@
   `a` varchar(12) COLLATE utf8_bin NOT NULL,
   `c` int NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t1 ( 
 a varchar(12) collate utf8_bin not null,
@@ -614,7 +614,7 @@
   `a` varchar(12) COLLATE utf8_bin NOT NULL,
   `b` int NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t1 ( 
 a varchar(12) collate utf8_bin,
@@ -626,7 +626,7 @@
   `a` varchar(12) COLLATE utf8_bin NOT NULL,
   `b` int NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1, t2;
 create table t1 ( 
 a1 int not null,
@@ -663,7 +663,7 @@
   `b` int DEFAULT '3',
   `a1` int DEFAULT NULL,
   `a2` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1, t2;
 create table t1 select * from t2;
 ERROR 42S02: Table 'test.t2' doesn't exist
@@ -914,7 +914,7 @@
   KEY `a062_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a063_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a064_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 flush tables;
 show create table t1;
 Table	Create Table
@@ -999,7 +999,7 @@
   KEY `a062_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a063_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a064_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t1 (c1 int, c2 int, c3 int, c4 int, c5 int, c6 int, c7 int, 
 c8 int, c9 int, c10 int, c11 int, c12 int, c13 int, c14 int, c15 int, c16 int);
@@ -1215,7 +1215,7 @@
   KEY `a062_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a063_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a064_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 flush tables;
 show create table t1;
 Table	Create Table
@@ -1300,7 +1300,7 @@
   KEY `a062_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a063_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a064_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 alter table t1 add key 
 a065_long_123456789_123456789_123456789_123456789_123456789_1234 (
 c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16);
@@ -1335,7 +1335,7 @@
   `c15` int DEFAULT NULL,
   `c16` int DEFAULT NULL,
   `c17` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 
 Bug #26104 Bug on foreign key class constructor
@@ -1441,7 +1441,7 @@
 им�_таблицы_в_кодировке_утф8_длиной_больше_чем_48	CREATE TABLE `им�_таблицы_в_кодировке_утф8_длиной_больше_чем_48` (
   `им�_пол�_в_кодировке_утф8_длиной_больше_чем_45` int DEFAULT NULL,
   KEY `им�_индек�а_в_кодировке_утф8_длиной_больше_чем_48` (`им�_пол�_в_кодировке_утф8_длиной_больше_чем_45`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table им�_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
 create table t1 like data_dictionary.processlist;
 ERROR HY000: Can't create table 'test.t1' (errno: 1)
@@ -1457,7 +1457,7 @@
   `TIME` bigint NOT NULL,
   `STATE` varchar(256) NOT NULL,
   `INFO` varchar(100) NOT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create temporary table t1 like data_dictionary.processlist;
 ERROR HY000: Can't create table 'test.#t1' (errno: 138)
@@ -1473,7 +1473,7 @@
   `TIME` bigint NOT NULL,
   `STATE` varchar(256) NOT NULL,
   `INFO` varchar(100) NOT NULL
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 drop table t1;
 
 # --
@@ -1502,7 +1502,7 @@
   `c4` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT 'a',
   `c5` varchar(255) COLLATE utf8_unicode_ci DEFAULT 'b',
   `c6` varchar(255) COLLATE utf8_bin DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_bin
 
 CREATE TABLE t2 AS SELECT * FROM t1;
 
@@ -1515,7 +1515,7 @@
   `c4` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT 'a',
   `c5` varchar(255) COLLATE utf8_unicode_ci DEFAULT 'b',
   `c6` varchar(255) COLLATE utf8_bin DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 
 DROP TABLE t2;
 

=== modified file 'tests/r/create_not_windows.result'
--- tests/r/create_not_windows.result	2010-02-04 08:14:46 +0000
+++ tests/r/create_not_windows.result	2010-08-17 22:51:53 +0000
@@ -10,5 +10,5 @@
   `_id` int NOT NULL AUTO_INCREMENT,
   `about:text` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`_id`)
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 drop table `about:text`;

=== modified file 'tests/r/ctype_utf8.result'
--- tests/r/ctype_utf8.result	2010-05-14 22:42:05 +0000
+++ tests/r/ctype_utf8.result	2010-08-17 22:51:53 +0000
@@ -112,7 +112,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 select * from t1;
 date_format("2004-01-19 10:10:10", "%Y-%m-%d")
 2004-01-19
@@ -309,7 +309,7 @@
 t1	CREATE TEMPORARY TABLE `t1` (
   `c` varchar(10) DEFAULT NULL,
   UNIQUE KEY `a` (`c`(2)) USING BTREE
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 insert into t1 values ('1'),('2'),('3'),('4'),('x'),('y'),('z');
 insert into t1 values ('a');
 insert into t1 values ('aa');
@@ -487,7 +487,7 @@
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` varchar(1) DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 drop table t1;
 select 'c' like '\_' as want0;

=== modified file 'tests/r/default.result'
--- tests/r/default.result	2010-01-08 06:23:08 +0000
+++ tests/r/default.result	2010-08-17 22:51:53 +0000
@@ -67,9 +67,9 @@
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TEMPORARY TABLE `t2` (
-  `a` varbinary(30) NOT NULL DEFAULT ' ',
-  `b` varbinary(1) NOT NULL DEFAULT ' ',
-  `c` varbinary(4) NOT NULL DEFAULT '0000',
+  `a` varbinary(30) NOT NULL DEFAULT 0x20,
+  `b` varbinary(1) NOT NULL DEFAULT 0x20,
+  `c` varbinary(4) NOT NULL DEFAULT 0x30303030,
   `d` blob,
   `e` blob,
   `f` blob,
@@ -83,19 +83,19 @@
   `n` blob,
   `o` blob,
   `p` blob,
-  `q` varbinary(30) NOT NULL DEFAULT ' ',
-  `r` varbinary(30) NOT NULL DEFAULT ' ',
+  `q` varbinary(30) NOT NULL DEFAULT 0x20,
+  `r` varbinary(30) NOT NULL DEFAULT 0x20,
   `s` blob,
-  `t` varbinary(4) NOT NULL DEFAULT ' ',
-  `u` varbinary(1) NOT NULL DEFAULT ' ',
-  `v` varbinary(30) NOT NULL DEFAULT ' ',
-  `w` varbinary(30) NOT NULL DEFAULT ' ',
+  `t` varbinary(4) NOT NULL DEFAULT 0x20,
+  `u` varbinary(1) NOT NULL DEFAULT 0x20,
+  `v` varbinary(30) NOT NULL DEFAULT 0x20,
+  `w` varbinary(30) NOT NULL DEFAULT 0x20,
   `x` blob,
-  `y` varbinary(5) NOT NULL DEFAULT ' ',
-  `z` varbinary(20) NOT NULL DEFAULT ' ',
-  `a1` varbinary(30) NOT NULL DEFAULT ' ',
+  `y` varbinary(5) NOT NULL DEFAULT 0x20,
+  `z` varbinary(20) NOT NULL DEFAULT 0x20,
+  `a1` varbinary(30) NOT NULL DEFAULT 0x20,
   `b1` blob
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_bin
 INSERT into t2 (b) values ('1');
 SHOW WARNINGS;
 Level	Code	Message

=== modified file 'tests/r/default_collation.result'
--- tests/r/default_collation.result	2010-04-05 23:46:43 +0000
+++ tests/r/default_collation.result	2010-08-17 22:51:53 +0000
@@ -35,12 +35,12 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(10) COLLATE utf8_bin DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_bin
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` varchar(10) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 select count(*) from t1 where a='a';
 count(*)
 1

=== modified file 'tests/r/drizzledump-max.result'
--- tests/r/drizzledump-max.result	2010-07-02 15:58:00 +0000
+++ tests/r/drizzledump-max.result	2010-08-17 22:51:53 +0000
@@ -74,7 +74,7 @@
 CREATE TABLE `t1` (
   `id` int DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT  IGNORE INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
@@ -83,7 +83,7 @@
 CREATE TABLE `t2` (
   `id` int DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
-) ENGINE=ARCHIVE;
+) ENGINE=ARCHIVE COLLATE = utf8_general_ci;
 
 ALTER TABLE `t2` DISABLE KEYS;
 INSERT  IGNORE INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
@@ -92,7 +92,7 @@
 CREATE TABLE `t6` (
   `id` int DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t6` DISABLE KEYS;
 INSERT  IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
@@ -109,7 +109,7 @@
 CREATE TABLE `t1` (
   `id` int DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
@@ -118,7 +118,7 @@
 CREATE TABLE `t2` (
   `id` int DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
-) ENGINE=ARCHIVE;
+) ENGINE=ARCHIVE COLLATE = utf8_general_ci;
 
 ALTER TABLE `t2` DISABLE KEYS;
 INSERT INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
@@ -127,7 +127,7 @@
 CREATE TABLE `t6` (
   `id` int DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t6` DISABLE KEYS;
 INSERT INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');

=== modified file 'tests/r/drizzledump.result'
--- tests/r/drizzledump.result	2010-07-12 06:26:42 +0000
+++ tests/r/drizzledump.result	2010-08-17 22:51:53 +0000
@@ -10,7 +10,7 @@
 ("0987654321098765432109876543210987654321");
 CREATE TABLE `t1` (
   `a` decimal(64,20) DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000');
 DROP TABLE t1;
 #
@@ -45,7 +45,7 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT INTO `t1` VALUES (1),(2);
@@ -57,7 +57,7 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT INTO `t1` VALUES (1),(2);
@@ -71,7 +71,7 @@
 create table ```a` (i int);
 CREATE TABLE ```a` (
   `i` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 drop table ```a`;
 #
 # Bug #2705 'mysqldump --tab extra output'
@@ -81,7 +81,7 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 1
 2
@@ -126,7 +126,7 @@
 DROP TABLE IF EXISTS `t2`;
 CREATE TABLE `t2` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t2` DISABLE KEYS;
 INSERT INTO `t2` VALUES (4),(5),(6);
@@ -145,7 +145,7 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `b` blob
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT INTO `t1` VALUES (0x602010000280100005E71A);
@@ -164,7 +164,7 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT  IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
@@ -176,7 +176,7 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT  IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
@@ -854,7 +854,7 @@
   `F_cd00692c3bfe59267d5ecfac5310286c` int DEFAULT NULL,
   `F_6faa8040da20ef399b63a72d0e4ab575` int DEFAULT NULL,
   `F_fe73f687e5bc5280214e0486b273a5f9` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT INTO `t1` (`F_c4ca4238a0b923820dcc509a6f75849b`, `F_c81e728d9d4c2f636f067f89cc14862c`, `F_eccbc87e4b5ce2fe28308fd9f2a7baf3`, `F_a87ff679a2f3e71d9181a67b7542122c`, `F_e4da3b7fbbce2345d7772b0674a318d5`, `F_1679091c5a880faf6fb5e6087eb1b2dc`, `F_8f14e45fceea167a5a36dedd4bea2543`, `F_c9f0f895fb98ab9159f51fd0297e236d`, `F_45c48cce2e2d7fbdea1afc51c7c6ad26`, `F_d3d9446802a44259755d38e6d163e820`, `F_6512bd43d9caa6e02c990b0a82652dca`, `F_c20ad4d76fe97759aa27a0c99bff6710`, `F_c51ce410c124a10e0db5e4b97fc2af39`, `F_aab3238922bcc25a6f606eb525ffdc56`, `F_9bf31c7ff062936a96d3c8bd1f8f2ff3`, `F_c74d97b01eae257e44aa9d5bade97baf`, `F_70efdf2ec9b086079795c442636b55fb`, `F_6f4922f45568161a8cdf4ad2299f6d23`, `F_1f0e3dad99908345f7439f8ffabdffc4`, `F_98f13708210194c475687be6106a3b84`, `F_3c59dc048e8850243be8079a5c74d079`, `F_b6d767d2f8ed5d21a44b0e5886680cb9`, `F_37693cfc748049e45d87b8c7d8b9aacd`, `F_1ff1de774005f8da13f42943881c655f`, `F_8e296a067a37563370ded05f5a3bf3ec`, `F_4e732ced3463d06de0ca9a15b6153677`, `F_02e74f10e0327ad868d138f2b4fdd6f0`, `F_33e75ff09dd601bbe69f351039152189`, `F_6ea9ab1baa0efb9e19094440c317e21b`, `F_34173cb38f07f89ddbebc2ac9128303f`, `F_c16a5320fa475530d9583c34fd356ef5`, `F_6364d3f0f495b6ab9dcf8d3b5c6e0b01`, `F_182be0c5cdcd5072bb1864cdee4d3d6e`, `F_e369853df766fa44e1ed0ff613f563bd`, `F_1c383cd30b7c298ab50293adfecb7b18`, `F_19ca14e7ea6328a42e0eb13d585e4c22`, `F_a5bfc9e07964f8dddeb95fc584cd965d`, `F_a5771bce93e200c36f7cd9dfd0e5deaa`, `F_d67d8ab4f4c10bf22aa353e27879133c`, `F_d645920e395fedad7bbbed0eca3fe2e0`, `F_3416a75f4cea9109507cacd8e2f2aefc`, `F_a1d0c6e83f027327d8461063f4ac58a6`, `F_17e62166fc8586dfa4d1bc0e1742c08b`, `F_f7177163c833dff4b38fc8d2872f1ec6`, `F_6c8349cc7260ae62e3b1396831a8398f`, `F_d9d4f495e875a2e075a1a4a6e1b9770f`, `F_67c6a1e7ce56d3d6fa748ab6d9af3fd7`, `F_642e92efb79421734881b53e1e1b18b6`, `F_f457c545a9ded88f18ecee47145a72c0`, `F_c0c7c76d30bd3dcaefc96f40275bdc0a`, `F_2838023a778dfaecdc212708f721b788`, `F_9a1158154dfa42caddbd0694a4e9bdc8`, `F_d82c8d1619ad8176d665453cfb2e55f0`, `F_a684eceee76fc522773286a895bc8436`, `F_b53b3a3d6ab90ce0268229151c9bde11`, `F_9f61408e3afb633e50cdf1b20de6f466`, `F_72b32a1f754ba1c09b3695e0cb6cde7f`, `F_66f041e16a60928b05a7e228a89c3799`, `F_093f65e080a295f8076b1c5722a46aa2`, `F_072b030ba126b2f4b2374f342be9ed44`, `F_7f39f8317fbdb1988ef4c628eba02591`, `F_44f683a84163b3523afe57c2e008bc8c`, `F_03afdbd66e7929b125f8597834fa83a4`, `F_ea5d2f1c4608232e07d3aa3d998e5135`, `F_fc490ca45c00b1249bbe3554a4fdf6fb`, `F_3295c76acbf4caaed33c36b1b5fc2cb1`, `F_735b90b4568125ed6c3f678819b6e058`, `F_a3f390d88e4c41f2747bfa2f1b5f87db`, `F_14bfa6bb14875e45bba028a21ed38046`, `F_7cbbc409ec990f19c78c75bd1e06f215`, `F_e2c420d928d4bf8ce0ff2ec19b371514`, `F_32bb90e8976aab5298d5da10fe66f21d`, `F_d2ddea18f00665ce8623e36bd4e3c7c5`, `F_ad61ab143223efbc24c7d2583be69251`, `F_d09bf41544a3365a46c9077ebb5e35c3`, `F_fbd7939d674997cdb4692d34de8633c4`, `F_28dd2c7955ce926456240b2ff0100bde`, `F_35f4a8d465e6e1edc05f3d8ab658c551`, `F_d1fe173d08e959397adf34b1d77e88d7`, `F_f033ab37c30201f73f142449d037028d`, `F_43ec517d68b6edd3015b3edc9a11367b`, `F_9778d5d219c5080b9a6a17bef029331c`, `F_fe9fc289c3ff0af142b6d3bead98a923`, `F_68d30a9594728bc39aa24be94b319d21`, `F_3ef815416f775098fe977004015c6193`, `F_93db85ed909c13838ff95ccfa94cebd9`, `F_c7e1249ffc03eb9ded908c236bd1996d`, `F_2a38a4a9316c49e5a833517c45d31070`, `F_7647966b7343c29048673252e490f736`, `F_8613985ec49eb8f757ae6439e879bb2a`, `F_54229abfcfa5649e7003b83dd4755294`, `F_92cc227532d17e56e07902b254dfad10`, `F_98dce83da57b0395e163467c9dae521b`, `F_f4b9ec30ad9f68f89b29639786cb62ef`, `F_812b4ba287f5ee0bc9d43bbf5bbe87fb`, `F_26657d5ff9020d2abefe558796b99584`, `F_e2ef524fbf3d9fe611d5a8e90fefdc9c`, `F_ed3d2c21991e3bef5e069713af9fa6ca`, `F_ac627ab1ccbdb62ec96e702f07f6425b`, `F_f899139df5e1059396431415e770c6dd`, `F_38b3eff8baf56627478ec76a704e9b52`, `F_ec8956637a99787bd197eacd77acce5e`, `F_6974ce5ac660610b44d9b9fed0ff9548`, `F_c9e1074f5b3f9fc8ea15d152add07294`, `F_65b9eea6e1cc6bb9f0cd2a47751a186f`, `F_f0935e4cd5920aa6c7c996a5ee53a70f`, `F_a97da629b098b75c294dffdc3e463904`, `F_a3c65c2974270fd093ee8a9bf8ae7d0b`, `F_2723d092b63885e0d7c260cc007e8b9d`, `F_5f93f983524def3dca464469d2cf9f3e`, `F_698d51a19d8a121ce581499d7b701668`, `F_7f6ffaa6bb0b408017b62254211691b5`, `F_73278a4a86960eeb576a8fd4c9ec6997`, `F_5fd0b37cd7dbbb00f97ba6ce92bf5add`, `F_2b44928ae11fb9384c4cf38708677c48`, `F_c45147dee729311ef5b5c3003946c48f`, `F_eb160de1de89d9058fcb0b968dbbbd68`, `F_5ef059938ba799aaa845e1c2e8a762bd`, `F_07e1cd7dca89a1678042477183b7ac3f`, `F_da4fb5c6e93e74d3df8527599fa62642`, `F_4c56ff4ce4aaf9573aa5dff913df997a`, `F_a0a080f42e6f13b3a2df133f073095dd`, `F_202cb962ac59075b964b07152d234b70`, `F_c8ffe9a587b126f152ed3d89a146b445`, `F_3def184ad8f4755ff269862ea77393dd`, `F_069059b7ef840f0c74a814ec9237b6ec`, `F_ec5decca5ed3d6b8079e2e7e7bacc9f2`, `F_76dc611d6ebaafc66cc0879c71b5db5c`, `F_d1f491a404d6854880943e5c3cd9ca25`, `F_9b8619251a19057cff70779273e95aa6`, `F_1afa34a7f984eeabdbb0a7d494132ee5`, `F_65ded5353c5ee48d0b7d48c591b8f430`, `F_9fc3d7152ba9336a670e36d0ed79bc43`, `F_02522a2b2726fb0a03bb19f2d8d9524d`, `F_7f1de29e6da19d22b51c68001e7e0e54`, `F_42a0e188f5033bc65bf8d78622277c4e`, `F_3988c7f88ebcb58c6ce932b957b6f332`, `F_013d407166ec4fa56eb1e1f8cbe183b9`, `F_e00da03b685a0dd18fb6a08af0923de0`, `F_1385974ed5904a438616ff7bdb3f7439`, `F_0f28b5d49b3020afeecd95b4009adf4c`, `F_a8baa56554f96369ab93e4f3bb068c22`, `F_903ce9225fca3e988c2af215d4e544d3`, `F_0a09c8844ba8f0936c20bd791130d6b6`, `F_2b24d495052a8ce66358eb576b8912c8`, `F_a5e00132373a7031000fd987a3c9f87b`, `F_8d5e957f297893487bd98fa830fa6413`, `F_47d1e990583c9c67424d369f3414728e`, `F_f2217062e9a397a1dca429e7d70bc6ca`, `F_7ef605fc8dba5425d6965fbd4c8fbe1f`, `F_a8f15eda80c50adb0e71943adc8015cf`, `F_37a749d808e46495a8da1e5352d03cae`, `F_b3e3e393c77e35a4a3f3cbd1e429b5dc`, `F_1d7f7abc18fcb43975065399b0d1e48e`, `F_2a79ea27c279e471f4d180b08d62b00a`, `F_1c9ac0159c94d8d0cbedc973445af2da`, `F_6c4b761a28b734fe93831e3fb400ce87`, `F_06409663226af2f3114485aa4e0a23b4`, `F_140f6969d5213fd0ece03148e62e461e`, `F_b73ce398c39f506af761d2277d853a92`, `F_bd4c9ab730f5513206b999ec0d90d1fb`, `F_82aa4b0af34c2313a562076992e50aa3`, `F_0777d5c17d4066b82ab86dff8a46af6f`, `F_fa7cdfad1a5aaf8370ebeda47a1ff1c3`, `F_9766527f2b5d3e95d4a733fcfb77bd7e`, `F_7e7757b1e12abcb736ab9a754ffb617a`, `F_5878a7ab84fb43402106c575658472fa`, `F_006f52e9102a8d3be2fe5614f42ba989`, `F_3636638817772e42b59d74cff571fbb3`, `F_149e9677a5989fd342ae44213df68868`, `F_a4a042cf4fd6bfb47701cbc8a1653ada`, `F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e`, `F_f7e6c85504ce6e82442c770f7c8606f0`, `F_bf8229696f7a3bb4700cfddef19fa23f`, `F_82161242827b703e6acf9c726942a1e4`, `F_38af86134b65d0f10fe33d30dd76442e`, `F_96da2f590cd7246bbde0051047b0d6f7`, `F_8f85517967795eeef66c225f7883bdcb`, `F_8f53295a73878494e9bc8dd6c3c7104f`, `F_045117b0e0a11a242b9765e79cbf113f`, `F_fc221309746013ac554571fbd180e1c8`, `F_4c5bde74a8f110656874902f07378009`, `F_cedebb6e872f539bef8c3f919874e9d7`, `F_6cdd60ea0045eb7a6ec44c54d29ed402`, `F_eecca5b6365d9607ee5a9d336962c534`, `F_9872ed9fc22fc182d371c3e9ed316094`, `F_31fefc0e570cb3860f2a6d4b38c6490d`, `F_9dcb88e0137649590b755372b040afad`, `F_a2557a7b2e94197ff767970b67041697`, `F_cfecdb276f634854f3ef915e2e980c31`, `F_0aa1883c6411f7873cb83dacb17b0afc`, `F_58a2fc6ed39fd083f55d4182bf88826d`, `F_bd686fd640be98efaae0091fa301e613`, `F_a597e50502f5ff68e3e25b9114205d4a`, `F_0336dcbab05b9d5ad24f4333c7658a0e`, `F_084b6fbb10729ed4da8c3d3f5a3ae7c9`, `F_85d8ce590ad8981ca2c8286f79f59954`, `F_0e65972dce68dad4d52d063967f0a705`, `F_84d9ee44e457ddef7f2c4f25dc8fa865`, `F_3644a684f98ea8fe223c713b77189a77`, `F_757b505cfd34c64c85ca5b5690ee5293`, `F_854d6fae5ee42911677c739ee1734486`, `F_e2c0be24560d78c5e599c2a9c9d0bbd2`, `F_274ad4786c3abca69fa097b85867d9a4`, `F_eae27d77ca20db309e056e3d2dcd7d69`, `F_7eabe3a1649ffa2b3ff8c02ebfd5659f`, `F_69adc1e107f7f7d035d7baf04342e1ca`, `F_091d584fced301b442654dd8c23b3fc9`, `F_b1d10e7bafa4421218a51b1e1f1b0ba2`, `F_6f3ef77ac0e3619e98159e9b6febf557`, `F_eb163727917cbba1eea208541a643e74`, `F_1534b76d325a8f591b52d302e7181331`, `F_979d472a84804b9f647bc185a877a8b5`, `F_ca46c1b9512a7a8315fa3c5a946e8265`, `F_3b8a614226a953a8cd9526fca6fe9ba5`, `F_45fbc6d3e05ebd93369ce542e8f2322d`, `F_63dc7ed1010d3c3b8269faf0ba7491d4`, `F_e96ed478dab8595a7dbda4cbcbee168f`, `F_c0e190d8267e36708f955d7ab048990d`, `F_ec8ce6abb3e952a85b8551ba726a1227`, `F_060ad92489947d410d897474079c1477`, `F_bcbe3365e6ac95ea2c0343a2395834dd`, `F_115f89503138416a242f40fb7d7f338e`, `F_13fe9d84310e77f13a6d184dbf1232f3`, `F_d1c38a09acc34845c6be3a127a5aacaf`, `F_9cfdf10e8fc047a44b08ed031e1f0ed1`, `F_705f2172834666788607efbfca35afb3`, `F_74db120f0a8e5646ef5a30154e9f6deb`, `F_57aeee35c98205091e18d1140e9f38cf`, `F_6da9003b743b65f4c0ccd295cc484e57`, `F_9b04d152845ec0a378394003c96da594`, `F_be83ab3ecd0db773eb2dc1b0a17836a1`, `F_e165421110ba03099a1c0393373c5b43`, `F_289dff07669d7a23de0ef88d2f7129e7`, `F_577ef1154f3240ad5b9b413aa7346a1e`, `F_01161aaa0b6d1345dd8fe4e481144d84`, `F_539fd53b59e3bb12d203f45a912eeaf2`, `F_ac1dd209cbcc5e5d1c6e28598e8cbbe8`, `F_555d6702c950ecb729a966504af0a635`, `F_335f5352088d7d9bf74191e006d8e24c`, `F_f340f1b1f65b6df5b5e3f94d95b11daf`, `F_e4a6222cdb5b34375400904f03d8e6a5`, `F_cb70ab375662576bd1ac5aaf16b3fca4`, `F_9188905e74c28e489b44e954ec0b9bca`, `F_0266e33d3f546cb5436a10798e657d97`, `F_38db3aed920cf82ab059bfccbd02be6a`, `F_3cec07e9ba5f5bb252d13f5f431e4bbb`, `F_621bf66ddb7c962aa0d22ac97d69b793`, `F_077e29b11be80ab57e1a2ecabb7da330`, `F_6c9882bbac1c7093bd25041881277658`, `F_19f3cd308f1455b3fa09a282e0d496f4`, `F_03c6b06952c750899bb03d998e631860`, `F_c24cd76e1ce41366a4bbe8a49b02a028`, `F_c52f1bd66cc19d05628bd8bf27af3ad6`, `F_fe131d7f5a6b38b23cc967316c13dae2`, `F_f718499c1c8cef6730f9fd03c8125cab`, `F_d96409bf894217686ba124d7356686c9`, `F_502e4a16930e414107ee22b6198c578f`, `F_cfa0860e83a4c3a763a7e62d825349f7`, `F_a4f23670e1833f3fdb077ca70bbd5d66`, `F_b1a59b315fc9a3002ce38bbe070ec3f5`, `F_36660e59856b4de58a219bcf4e27eba3`, `F_8c19f571e251e61cb8dd3612f26d5ecf`, `F_d6baf65e0b240ce177cf70da146c8dc8`, `F_e56954b4f6347e897f954495eab16a88`, `F_f7664060cc52bc6f3d620bcedc94a4b6`, `F_eda80a3d5b344bc40f3bc04f65b7a357`, `F_8f121ce07d74717e0b1f21d122e04521`, `F_06138bc5af6023646ede0e1f7c1eac75`, `F_39059724f73a9969845dfe4146c5660e`, `F_7f100b7b36092fb9b06dfb4fac360931`, `F_7a614fd06c325499f1680b9896beedeb`, `F_4734ba6f3de83d861c3176a6273cac6d`, `F_d947bf06a885db0d477d707121934ff8`, `F_63923f49e5241343aa7acb6a06a751e7`, `F_db8e1af0cb3aca1ae2d0018624204529`, `F_20f07591c6fcb220ffe637cda29bb3f6`, `F_07cdfd23373b17c6b337251c22b7ea57`, `F_d395771085aab05244a4fb8fd91bf4ee`, `F_92c8c96e4c37100777c7190b76d28233`, `F_e3796ae838835da0b6f6ea37bcf8bcb7`, `F_6a9aeddfc689c1d0e3b9ccc3ab651bc5`, `F_0f49c89d1e7298bb9930789c8ed59d48`, `F_46ba9f2a6976570b0353203ec4474217`, `F_0e01938fc48a2cfb5f2217fbfb00722d`, `F_16a5cdae362b8d27a1d8f8c7b78b4330`, `F_918317b57931b6b7a7d29490fe5ec9f9`, `F_48aedb8880cab8c45637abc7493ecddd`, `F_839ab46820b524afda05122893c2fe8e`, `F_f90f2aca5c640289d0a29417bcb63a37`, `F_9c838d2e45b2ad1094d42f4ef36764f6`, `F_1700002963a49da13542e0726b7bb758`, `F_53c3bce66e43be4f209556518c2fcb54`, `F_6883966fd8f918a4aa29be29d2c386fb`, `F_49182f81e6a13cf5eaa496d51fea6406`, `F_d296c101daa88a51f6ca8cfc1ac79b50`, `F_9fd81843ad7f202f26c1a174c7357585`, `F_26e359e83860db1d11b6acca57d8ea88`, `F_ef0d3930a7b6c95bd2b32ed45989c61f`, `F_94f6d7e04a4d452035300f18b984988c`, `F_34ed066df378efacc9b924ec161e7639`, `F_577bcc914f9e55d5e4e4f82f9f00e7d4`, `F_11b9842e0a271ff252c1903e7132cd68`, `F_37bc2f75bf1bcfe8450a1a41c200364c`, `F_496e05e1aea0a9c4655800e8a7b9ea28`, `F_b2eb7349035754953b57a32e2841bda5`, `F_8e98d81f8217304975ccb23337bb5761`, `F_a8c88a0055f636e4a163a5e3d16adab7`, `F_eddea82ad2755b24c4e168c5fc2ebd40`, `F_06eb61b839a0cefee4967c67ccb099dc`, `F_9dfcd5e558dfa04aaf37f137a1d9d3e5`, `F_950a4152c2b4aa3ad78bdd6b366cc179`, `F_158f3069a435b314a80bdcb024f8e422`, `F_758874998f5bd0c393da094e1967a72b`, `F_ad13a2a07ca4b7642959dc0c4c740ab6`, `F_3fe94a002317b5f9259f82690aeea4cd`, `F_5b8add2a5d98b1a652ea7fd72d942dac`, `F_432aca3a1e345e339f35a30c8f65edce`, `F_8d3bba7425e7c98c50f52ca1b52d3735`, `F_320722549d1751cf3f247855f937b982`, `F_caf1a3dfb505ffed0d024130f58c5cfa`, `F_5737c6ec2e0716f3d8a7a5c4e0de0d9a`, `F_bc6dc48b743dc5d013b1abaebd2faed2`, `F_f2fc990265c712c49d51a18a32b39f0c`, `F_89f0fd5c927d466d6ec9a21b9ac34ffa`, `F_a666587afda6e89aec274a3657558a27`, `F_b83aac23b9528732c23cc7352950e880`, `F_cd00692c3bfe59267d5ecfac5310286c`, `F_6faa8040da20ef399b63a72d0e4ab575`, `F_fe73f687e5bc5280214e0486b273a5f9`) VALUES (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -878,7 +878,7 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT INTO `t1` VALUES (1),(2),(3);
@@ -900,11 +900,11 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 DROP TABLE IF EXISTS `t2`;
 CREATE TABLE `t2` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
@@ -912,11 +912,11 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 DROP TABLE IF EXISTS `t2`;
 CREATE TABLE `t2` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 <?xml version="1.0"?>
@@ -1061,7 +1061,7 @@
   `t1_id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`t1_id`),
   KEY `t1_name` (`t1_name`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=1000
 DROP TABLE `t1`;
 select * from t1;
 t1_name	t1_id
@@ -1075,7 +1075,7 @@
   `t1_id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`t1_id`),
   KEY `t1_name` (`t1_name`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=1000
 drop table `t1`;
 #
 # Bug #18536: wrong table order
@@ -1088,15 +1088,15 @@
 DROP TABLE IF EXISTS `t3`;
 CREATE TABLE `t3` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 DROP TABLE IF EXISTS `t2`;
 CREATE TABLE `t2` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 drop table t1, t2, t3;
@@ -1111,7 +1111,7 @@
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
@@ -1171,7 +1171,7 @@
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL,
   `b` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 REPLACE INTO `t1` VALUES (1,1),(2,3),(3,4),(4,5);
@@ -1188,7 +1188,7 @@
 DROP TABLE IF EXISTS `test`;
 CREATE TABLE `test` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 ALTER TABLE `test` DISABLE KEYS;
 ALTER TABLE `test` ENABLE KEYS;
 drop database `test-database`;

=== modified file 'tests/r/foreign_key.result'
--- tests/r/foreign_key.result	2008-12-19 07:02:38 +0000
+++ tests/r/foreign_key.result	2010-08-17 22:51:53 +0000
@@ -25,9 +25,9 @@
   PRIMARY KEY (`no`),
   KEY `product_category` (`product_category`,`product_id`),
   KEY `customer_id` (`customer_id`),
-  CONSTRAINT `product_order_ibfk_1` FOREIGN KEY (`product_category`, `product_id`) REFERENCES `product` (`category`, `id`) ON UPDATE CASCADE,
+  CONSTRAINT `product_order_ibfk_1` FOREIGN KEY (`product_category`, `product_id`) REFERENCES `product` (`category`, `id`) ON UPDATE CASCADE ON DELETE RESTRICT,
   CONSTRAINT `product_order_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table product_order, customer, product;
 drop table if exists t_34455;
 create table t_34455 (

=== modified file 'tests/r/func_gconcat.result'
--- tests/r/func_gconcat.result	2009-10-31 18:12:20 +0000
+++ tests/r/func_gconcat.result	2010-08-17 22:51:53 +0000
@@ -459,7 +459,7 @@
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` varchar(100) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 select collation(group_concat(a,b)) from t1;
 collation(group_concat(a,b))
 utf8_general_ci

=== modified file 'tests/r/func_group.result'
--- tests/r/func_group.result	2010-08-09 16:31:29 +0000
+++ tests/r/func_group.result	2010-08-17 22:51:53 +0000
@@ -593,21 +593,21 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(1) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 create table t2 select max(a),min(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `max(a)` varchar(1) DEFAULT NULL,
   `min(a)` varchar(1) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t2;
 create table t2 select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `concat(a)` varchar(1) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t2,t1;
 create table t1 (a int);
 insert into t1 values (1);
@@ -679,7 +679,7 @@
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `MAX(b)` datetime DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1, t2;
 create table t1(f1 datetime);
 insert into t1 values (now());
@@ -905,14 +905,14 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `variance(0)` double(8,4) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t1 select stddev(0);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `stddev(0)` double(8,4) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table bug22555 (i int primary key auto_increment, s1 int, s2 int, e decimal(30,10), o double);
 insert into bug22555 (s1, s2, e, o) values (53, 78, 11.4276528, 6.828112), (17, 78, 5.916793, 1.8502951), (18, 76, 2.679231, 9.17975591), (31, 62, 6.07831, 0.1), (19, 41, 5.37463, 15.1), (83, 73, 14.567426, 7.959222), (92, 53, 6.10151, 13.1856852), (7, 12, 13.92272, 3.442007), (92, 35, 11.95358909, 6.01376678), (38, 84, 2.572, 7.904571);

=== modified file 'tests/r/func_math.result'
--- tests/r/func_math.result	2010-06-04 09:22:02 +0000
+++ tests/r/func_math.result	2010-08-17 22:51:53 +0000
@@ -168,7 +168,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `round(1, 6)` int NOT NULL
-) ENGINE=X
+) ENGINE=X COLLATE = utf8_general_ci
 select * from t1;
 round(1, 6)
 1

=== modified file 'tests/r/func_misc.result'
--- tests/r/func_misc.result	2009-03-25 09:18:25 +0000
+++ tests/r/func_misc.result	2010-08-17 22:51:53 +0000
@@ -38,7 +38,7 @@
 t1	CREATE TABLE `t1` (
   `uuid()` varchar(36) DEFAULT NULL,
   `length(uuid())` int DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 End of 5.0 tests
 select connection_id() > 0;

=== modified file 'tests/r/func_system.result'
--- tests/r/func_system.result	2009-05-15 17:06:35 +0000
+++ tests/r/func_system.result	2010-08-17 22:51:53 +0000
@@ -22,7 +22,7 @@
   `database()` varbinary(136) DEFAULT NULL,
   `user()` varbinary(308) DEFAULT NULL,
   `version` varchar(60) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 select TRUE,FALSE,NULL;
 TRUE	FALSE	NULL

=== modified file 'tests/r/heap.result'
--- tests/r/heap.result	2010-08-09 16:31:29 +0000
+++ tests/r/heap.result	2010-08-17 22:51:53 +0000
@@ -268,7 +268,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(50) DEFAULT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 create temporary table t2 like t1;
 show create table t2;
 Table	Create Table
@@ -276,7 +276,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(50) DEFAULT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 create temporary table t3 select * from t1;
 show create table t3;
 Table	Create Table
@@ -284,7 +284,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(50) DEFAULT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
@@ -292,7 +292,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(50) DEFAULT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
@@ -300,7 +300,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(50) DEFAULT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 alter table t1 modify t varchar(50);
 show create table t1;
 Table	Create Table
@@ -308,7 +308,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(50) DEFAULT NULL
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+ *+ *
@@ -324,7 +324,7 @@
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 select count(*) from t1;
 count(*)
 270
@@ -547,7 +547,7 @@
   KEY `v` (`v`) USING BTREE,
   KEY `c` (`c`) USING BTREE,
   KEY `t` (`t`(10)) USING BTREE
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 select count(*) from t1;
 count(*)
 270
@@ -638,7 +638,7 @@
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 drop table t1;
 create temporary table t1 (v varchar(16383), key(v(10)));
 show create table t1;
@@ -646,7 +646,7 @@
 t1	CREATE TEMPORARY TABLE `t1` (
   `v` varchar(16383) DEFAULT NULL,
   KEY `v` (`v`(10))
-) ENGINE=MEMORY
+) ENGINE=MEMORY COLLATE = utf8_general_ci
 insert into t1 values(repeat('a',16383));
 select length(v) from t1 where v=repeat('a',16383);
 length(v)

=== modified file 'tests/r/innodb.result'
--- tests/r/innodb.result	2010-07-12 06:26:42 +0000
+++ tests/r/innodb.result	2010-08-17 22:51:53 +0000
@@ -775,7 +775,7 @@
 t1	CREATE TABLE `t1` (
   `a` varchar(20) DEFAULT NULL,
   KEY `a` (`a`(5))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create temporary table t1 (a int not null auto_increment, primary key(a)) engine=innodb;
 insert into t1 values (NULL),(NULL),(NULL);
@@ -1153,14 +1153,14 @@
   `id` int NOT NULL,
   `id2` int NOT NULL,
   UNIQUE KEY `id` (`id`,`id2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `id` int NOT NULL,
   KEY `t1_id_fk` (`id`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create index id on t2 (id);
 show create table t2;
 Table	Create Table
@@ -1168,7 +1168,7 @@
   `id` int NOT NULL,
   KEY `id` (`id`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create index id2 on t2 (id);
 show create table t2;
 Table	Create Table
@@ -1177,7 +1177,7 @@
   KEY `id` (`id`),
   KEY `id2` (`id`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop index id2 on t2;
 drop index id on t2;
 Got one of the listed errors
@@ -1187,7 +1187,7 @@
   `id` int NOT NULL,
   KEY `id` (`id`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 create table t2 (id int not null, id2 int not null, constraint t1_id_fk foreign key (id,id2) references t1 (id,id2)) engine = innodb;
 show create table t2;
@@ -1197,7 +1197,7 @@
   `id2` int NOT NULL,
   KEY `t1_id_fk` (`id`,`id2`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`, `id2`) REFERENCES `t1` (`id`, `id2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create unique index id on t2 (id,id2);
 show create table t2;
 Table	Create Table
@@ -1206,7 +1206,7 @@
   `id2` int NOT NULL,
   UNIQUE KEY `id` (`id`,`id2`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`, `id2`) REFERENCES `t1` (`id`, `id2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 create table t2 (id int not null, id2 int not null, unique (id,id2),constraint t1_id_fk foreign key (id2,id) references t1 (id,id2)) engine = innodb;
 show create table t2;
@@ -1217,7 +1217,7 @@
   UNIQUE KEY `id` (`id`,`id2`),
   KEY `t1_id_fk` (`id2`,`id`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id2`, `id`) REFERENCES `t1` (`id`, `id2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 create table t2 (id int not null, id2 int not null, unique (id,id2), constraint t1_id_fk foreign key (id) references t1 (id)) engine = innodb;
 show create table t2;
@@ -1227,7 +1227,7 @@
   `id2` int NOT NULL,
   UNIQUE KEY `id` (`id`,`id2`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 create table t2 (id int not null, id2 int not null, unique (id,id2),constraint t1_id_fk foreign key (id2,id) references t1 (id,id2)) engine = innodb;
 show create table t2;
@@ -1238,7 +1238,7 @@
   UNIQUE KEY `id` (`id`,`id2`),
   KEY `t1_id_fk` (`id2`,`id`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id2`, `id`) REFERENCES `t1` (`id`, `id2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 create table t2 (id int not null auto_increment, id2 int not null, constraint t1_id_fk foreign key (id) references t1 (id), primary key (id), index (id,id2)) engine = innodb;
 show create table t2;
@@ -1249,7 +1249,7 @@
   PRIMARY KEY (`id`),
   KEY `id` (`id`,`id2`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 create table t2 (id int not null auto_increment, id2 int not null, constraint t1_id_fk foreign key (id) references t1 (id)) engine= innodb;
 show create table t2;
@@ -1259,7 +1259,7 @@
   `id2` int NOT NULL,
   KEY `t1_id_fk` (`id`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 alter table t2 add index id_test (id), add index id_test2 (id,id2);
 show create table t2;
 Table	Create Table
@@ -1269,7 +1269,7 @@
   KEY `id_test` (`id`),
   KEY `id_test2` (`id`,`id2`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 create table t2 (id int not null, id2 int not null, constraint t1_id_fk foreign key (id2,id) references t1 (id)) engine = innodb;
 ERROR 42000: Incorrect foreign key definition for 't1_id_fk': Key reference and table reference don't match
@@ -1283,7 +1283,7 @@
   UNIQUE KEY `b_2` (`b`),
   KEY `b` (`b`),
   CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2;
 create table t2 (a int auto_increment primary key, b int, foreign key (b) references t1(id), foreign key (b) references t1(id), unique(b)) engine=innodb;
 show create table t2;
@@ -1295,7 +1295,7 @@
   UNIQUE KEY `b` (`b`),
   CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`id`),
   CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t2, t1;
 create table t1 (c char(10), index (c,c)) engine=innodb;
 ERROR 42S21: Duplicate column name 'c'
@@ -1512,7 +1512,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create  table t2 like t1;
 show create table t2;
 Table	Create Table
@@ -1520,7 +1520,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 create  table t3 select * from t1;
 show create table t3;
 Table	Create Table
@@ -1528,7 +1528,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
@@ -1536,7 +1536,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
@@ -1544,7 +1544,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 alter table t1 modify t varchar(10);
 show create table t1;
 Table	Create Table
@@ -1552,7 +1552,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+ *+ *
@@ -1568,7 +1568,7 @@
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 select count(*) from t1;
 count(*)
 270
@@ -1789,7 +1789,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(255))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 select count(*) from t1 where v='a';
 count(*)
 10
@@ -1869,7 +1869,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 select count(*) from t1 where v='a';
 count(*)
 10
@@ -1951,7 +1951,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(255))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a
	1
@@ -2029,14 +2029,14 @@
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create  table t1 (v char(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create  table t1 (v varchar(10), c char(10));
 show create table t1;
@@ -2044,7 +2044,7 @@
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 insert into t1 values('a','a'),('a ','a ');
 select concat('*',v,'*',c,'*') from t1;
 concat('*',v,'*',c,'*')
@@ -2069,14 +2069,14 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(16383) DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create table t1 (v varchar(16383));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(16383) DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 set storage_engine=InnoDB;
 create table t1 (v varchar(16383)) engine=innodb;
@@ -2195,7 +2195,7 @@
   `col1` varchar(512) DEFAULT NULL,
   `col2` varchar(512) DEFAULT NULL,
   KEY `col1` (`col1`(255),`col2`(255))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1, t2, t4, t5, t6, t7, t8, t9;
 create table t1 (col1 varchar(768), index(col1))
 engine = innodb;
@@ -2214,7 +2214,7 @@
 t1	CREATE TABLE `t1` (
   `col1` varchar(768) DEFAULT NULL,
   KEY `col1` (`col1`(255))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1, t2, t3, t4;
 create table t1 (col1 varchar(768) primary key)
 engine = innodb;
@@ -2413,7 +2413,7 @@
 t2	CREATE TABLE `t2` (
   `a` int DEFAULT NULL,
   KEY `t2_ibfk_0` (`a`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 DROP TABLE t2,t1;
 CREATE TABLE t1 (
 field1 varchar(8) NOT NULL DEFAULT '',
@@ -2453,7 +2453,7 @@
   PRIMARY KEY (`c1`),
   UNIQUE KEY `c2` (`c2`),
   CONSTRAINT `c2_fk` FOREIGN KEY (`c2`) REFERENCES `t2` (`c1`) ON DELETE CASCADE
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 alter table t1 drop foreign key c2_fk;
 show create table t1;
 Table	Create Table
@@ -2462,7 +2462,7 @@
   `c2` bigint NOT NULL,
   PRIMARY KEY (`c1`),
   UNIQUE KEY `c2` (`c2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1, t2;
 create table t1(a date) engine=innodb;
 create table t2(a date, key(a)) engine=innodb;
@@ -2653,9 +2653,9 @@
   `f` int NOT NULL,
   PRIMARY KEY (`id`),
   KEY `f` (`f`),
-  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f`) REFERENCES `t1` (`f`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `t2_t1` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB
+  CONSTRAINT `t2_t1` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,
+  CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`f`) REFERENCES `t1` (`f`) ON UPDATE CASCADE ON DELETE CASCADE
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 DROP TABLE t2, t1;
 CREATE TABLE t1 (a INT, INDEX(a)) ENGINE=InnoDB;
 CREATE TABLE t2 (a INT, INDEX(a)) ENGINE=InnoDB;
@@ -2688,7 +2688,7 @@
 t1	CREATE TABLE `t1` (
   `id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci AUTO_INCREMENT=42
 CREATE TABLE t2 (id int PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t2 VALUES(42),(347),(348);
 ALTER TABLE t1 ADD CONSTRAINT t1_t2 FOREIGN KEY (id) REFERENCES t2(id);
@@ -2698,7 +2698,7 @@
   `id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   CONSTRAINT `t1_t2` FOREIGN KEY (`id`) REFERENCES `t2` (`id`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 DROP TABLE t1,t2;
 DROP TABLE IF EXISTS t1;
 Warnings:

=== modified file 'tests/r/innodb_mysql.result'
--- tests/r/innodb_mysql.result	2010-08-09 16:31:29 +0000
+++ tests/r/innodb_mysql.result	2010-08-17 22:51:53 +0000
@@ -483,7 +483,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB COMMENT='123'
+) ENGINE=InnoDB COMMENT='123' COLLATE = utf8_general_ci
 drop table t1;
 CREATE TABLE t1 (a CHAR(2), KEY (a)) ENGINE = InnoDB;
 INSERT INTO t1 VALUES ('uk'),('bg');
@@ -941,7 +941,7 @@
 t1	CREATE TABLE `t1` (
   `a` text,
   KEY `a` (`a`(255))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 CREATE TABLE t1 (
 a INT,
@@ -1154,7 +1154,7 @@
   `b` varchar(4) NOT NULL,
   UNIQUE KEY `bb` (`b`),
   UNIQUE KEY `aa` (`a`(1))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 CREATE TABLE t1 (id int, type char(6), d int, INDEX idx(id,d)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES 
@@ -1274,7 +1274,7 @@
 CREATE TABLE t1 (a INT NOT NULL, b INT NOT NULL, PRIMARY KEY (a,b)) engine=innodb;
 CREATE TABLE t2 (c INT NOT NULL, d INT NOT NULL, PRIMARY KEY (c,d),
 CONSTRAINT c2 FOREIGN KEY f2 (c) REFERENCES t1 (a,b) ON UPDATE NO ACTION) engine=innodb;
-ERROR 42000: Incorrect foreign key definition for 'f2': Key reference and table reference don't match
+ERROR 42000: Incorrect foreign key definition for 'c2': Key reference and table reference don't match
 CREATE TABLE t2 (c INT NOT NULL, d INT NOT NULL, PRIMARY KEY (c,d),
 CONSTRAINT c2 FOREIGN KEY (c) REFERENCES t1 (a,b) ON UPDATE NO ACTION) engine=innodb;
 ERROR 42000: Incorrect foreign key definition for 'c2': Key reference and table reference don't match
@@ -1302,9 +1302,9 @@
   PRIMARY KEY (`c`,`d`),
   CONSTRAINT `c1` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON DELETE NO ACTION,
   CONSTRAINT `c2` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION,
-  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION,
-  CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION
-) ENGINE=InnoDB
+  CONSTRAINT `f3` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION,
+  CONSTRAINT `t2_ibfk_4` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 DROP TABLE t2;
 DROP TABLE t1;
 create table t1 (a int auto_increment primary key) engine=innodb;

=== modified file 'tests/r/key.result'
--- tests/r/key.result	2010-07-12 06:26:42 +0000
+++ tests/r/key.result	2010-08-17 22:51:53 +0000
@@ -212,7 +212,7 @@
   `t` text,
   UNIQUE KEY `c` (`c`(2)),
   UNIQUE KEY `t` (`t`(3))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 insert t1 values ('cccc', 'tttt'),
 (0xD0B1212223D0B1D0B1D0B1D0B1D0B1, 0xD0B1D0B1212223D0B1D0B1D0B1D0B1),
 (0xD0B1222123D0B1D0B1D0B1D0B1D0B1, 0xD0B1D0B1222123D0B1D0B1D0B1D0B1);
@@ -311,7 +311,7 @@
   `i2` int NOT NULL,
   UNIQUE KEY `i1idx` (`i1`),
   UNIQUE KEY `i2idx` (`i2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create temporary table t1 (
 c1 int,
@@ -337,7 +337,7 @@
   `a` varchar(10) DEFAULT NULL,
   `b` varchar(10) DEFAULT NULL,
   KEY `a` (`a`,`b`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 alter table t1 modify b varchar(20);
 show create table t1;
 Table	Create Table
@@ -345,7 +345,7 @@
   `a` varchar(10) DEFAULT NULL,
   `b` varchar(20) DEFAULT NULL,
   KEY `a` (`a`,`b`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 alter table t1 modify a varchar(20);
 show create table t1;
 Table	Create Table
@@ -353,7 +353,7 @@
   `a` varchar(20) DEFAULT NULL,
   `b` varchar(20) DEFAULT NULL,
   KEY `a` (`a`,`b`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create table t1 (a int not null primary key, b varchar(20) not null unique);
 desc t1;
@@ -408,7 +408,7 @@
   KEY `i3` (`c3`),
   KEY `i5` (`c1`,`c2`,`c3`,`c4`),
   KEY `c2` (`c2`,`c4`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 alter table t1 drop index c1;
 alter table t1 add index (c1);
 alter table t1 add index (c1);
@@ -441,7 +441,7 @@
   KEY `i2` (`c2`),
   KEY `i4` (`c4`),
   KEY `c2` (`c2`(4),`c3`(7))
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 insert into t1 values(1, 'a', 'a', NULL);
 insert into t1 values(1, 'b', 'b', NULL);
 alter table t1 drop index i3, drop index i2, drop index i1;
@@ -506,7 +506,7 @@
   UNIQUE KEY `cc` (`c`),
   UNIQUE KEY `bb` (`b`(1)),
   KEY `aa` (`a`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create table t1(a int not null, key aa(a), 
 b char(10) not null, unique key bb(b(1)),
@@ -531,7 +531,7 @@
   UNIQUE KEY `cc` (`c`),
   UNIQUE KEY `bb` (`b`(1)),
   KEY `aa` (`a`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 End of 5.0 tests
 DROP TABLE IF EXISTS t1;

=== modified file 'tests/r/mix2_myisam.result'
--- tests/r/mix2_myisam.result	2010-06-22 19:48:34 +0000
+++ tests/r/mix2_myisam.result	2010-08-17 22:51:53 +0000
@@ -633,7 +633,7 @@
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` varchar(20) DEFAULT NULL,
   KEY `a` (`a`(5))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 drop table t1;
 create temporary table t1 (a int not null auto_increment, primary key(a)) engine=MyISAM;
 insert into t1 values (NULL),(NULL),(NULL);
@@ -903,7 +903,7 @@
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` int DEFAULT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1,t2;
 flush status;
 show status like "binlog_cache_use";
@@ -1039,7 +1039,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 create TEMPORARY table t2 like t1;
 show create table t2;
 Table	Create Table
@@ -1047,7 +1047,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 create TEMPORARY table t3 select * from t1;
 show create table t3;
 Table	Create Table
@@ -1055,7 +1055,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
@@ -1063,7 +1063,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
@@ -1071,7 +1071,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 alter table t1 modify t varchar(10);
 show create table t1;
 Table	Create Table
@@ -1079,7 +1079,7 @@
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+ *+ *
@@ -1095,7 +1095,7 @@
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select count(*) from t1;
 count(*)
 270
@@ -1314,7 +1314,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select count(*) from t1 where v='a';
 count(*)
 10
@@ -1394,7 +1394,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select count(*) from t1 where v='a';
 count(*)
 10
@@ -1476,7 +1476,7 @@
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(333))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a
	1
@@ -1554,14 +1554,14 @@
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 drop table t1;
 create TEMPORARY table t1 (v char(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `v` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 drop table t1;
 create TEMPORARY table t1 (v varchar(10), c char(10));
 show create table t1;
@@ -1569,7 +1569,7 @@
 t1	CREATE TEMPORARY TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 insert into t1 values('a','a'),('a ','a ');
 select concat('*',v,'*',c,'*') from t1;
 concat('*',v,'*',c,'*')

=== modified file 'tests/r/mysql_protocol.result'
--- tests/r/mysql_protocol.result	2010-01-16 19:15:44 +0000
+++ tests/r/mysql_protocol.result	2010-08-17 22:51:53 +0000
@@ -7,7 +7,7 @@
 CREATE TABLE `t1` (
   `a` int DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 ALTER TABLE `t1` DISABLE KEYS;
 INSERT INTO `t1` VALUES (1),(2);

=== modified file 'tests/r/null.result'
--- tests/r/null.result	2010-07-12 06:26:42 +0000
+++ tests/r/null.result	2010-08-17 22:51:53 +0000
@@ -219,7 +219,7 @@
   `c36` varchar(3) DEFAULT NULL,
   `c37` varchar(10) DEFAULT NULL,
   `c38` varchar(10) DEFAULT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 select 
 case 'str' when 'STR' then 'str' when null then 'null' end as c01,

=== modified file 'tests/r/null_key.result'
--- tests/r/null_key.result	2010-08-09 16:31:29 +0000
+++ tests/r/null_key.result	2010-08-17 22:51:53 +0000
@@ -81,7 +81,7 @@
   `b` int NOT NULL,
   UNIQUE KEY `a` (`a`,`b`),
   KEY `b` (`b`)
-) ENGINE=MyISAM
+) ENGINE=MyISAM COLLATE = utf8_general_ci
 insert into t2 select * from t1;
 alter table t1 modify b blob not null, add c int not null, drop key a, add unique key (a,b(20),c), drop key b, add key (b(10));
 explain select * from t1 where a is null and b = 2;

=== modified file 'tests/r/parser_bug21114_innodb.result'
--- tests/r/parser_bug21114_innodb.result	2009-02-17 10:00:38 +0000
+++ tests/r/parser_bug21114_innodb.result	2010-08-17 22:51:53 +0000
@@ -7,7 +7,7 @@
   `col2` int NOT NULL,
   `col3` varchar(10) DEFAULT NULL,
   PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 SHOW CREATE TABLE bug21114_child;
 Table	Create Table
 bug21114_child	CREATE TABLE `bug21114_child` (
@@ -20,7 +20,7 @@
   KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
   CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `abs` (`col1`, `col2`),
   CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `abs` (`col1`, `col2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 DROP TABLE bug21114_child;
 DROP TABLE abs;
 drop table if exists field;
@@ -32,7 +32,7 @@
   `col2` int NOT NULL,
   `col3` varchar(10) DEFAULT NULL,
   PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 SHOW CREATE TABLE bug21114_child;
 Table	Create Table
 bug21114_child	CREATE TABLE `bug21114_child` (
@@ -45,7 +45,7 @@
   KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
   CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `field` (`col1`, `col2`),
   CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `field` (`col1`, `col2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 DROP TABLE bug21114_child;
 DROP TABLE field;
 drop table if exists format;
@@ -57,7 +57,7 @@
   `col2` int NOT NULL,
   `col3` varchar(10) DEFAULT NULL,
   PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 SHOW CREATE TABLE bug21114_child;
 Table	Create Table
 bug21114_child	CREATE TABLE `bug21114_child` (
@@ -70,7 +70,7 @@
   KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
   CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `format` (`col1`, `col2`),
   CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `format` (`col1`, `col2`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 DROP TABLE bug21114_child;
 DROP TABLE format;
 drop table if exists acos;

=== modified file 'tests/r/select.result'
--- tests/r/select.result	2010-08-09 16:31:29 +0000
+++ tests/r/select.result	2010-08-17 22:51:53 +0000
@@ -3253,7 +3253,7 @@
   `i` decimal(19,0) NOT NULL,
   `c` decimal(19,0) NOT NULL,
   `co` decimal(19,0) NOT NULL
-) ENGINE=InnoDB
+) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 select 
 if(1, 1111111111111111111, 1) i,

=== modified file 'tests/r/show_check.result'
--- tests/r/show_check.result	2010-07-13 09:09:38 +0000
+++ tests/r/show_check.result	2010-08-17 22:51:53 +0000
@@ -120,13 +120,13 @@
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int NOT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 alter table t1 rename t2;
 show create table t2;
 Table	Create Table
 t2	CREATE TEMPORARY TABLE `t2` (
   `a` int NOT NULL
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t2;
 create table t1 (
 name char(20) default 'O''Brien' comment 'O''Brien as default',
@@ -141,7 +141,7 @@
   `c` int NOT NULL COMMENT 'int column',
   `c-b` int DEFAULT NULL COMMENT 'name with a minus',
   `space 2` int DEFAULT NULL COMMENT 'name with a space'
-) ENGINE=DEFAULT COMMENT='it''s a table'
+) ENGINE=DEFAULT COMMENT='it''s a table' COLLATE = utf8_general_ci
 show columns from t1;
 Field	Type	Null	Default	Default_is_NULL	On_Update
 name	VARCHAR	YES	O'Brien	NO	
@@ -155,7 +155,7 @@
 t1	CREATE TABLE `t1` (
   `a` int NOT NULL,
   UNIQUE KEY `aa` (`a`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create table t1 (a int not null, primary key (a));
 show create table t1;
@@ -163,7 +163,7 @@
 t1	CREATE TABLE `t1` (
   `a` int NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=DEFAULT
+) ENGINE=DEFAULT COLLATE = utf8_general_ci
 drop table t1;
 create temporary table t1 (a int not null, b VARCHAR(10), INDEX (b) ) COMMENT="test" ENGINE=MYISAM ROW_FORMAT=fixed;
 show create table t1;
@@ -172,7 +172,7 @@
   `a` int NOT NULL,
   `b` varchar(10) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=MyISAM ROW_FORMAT='fixed' COMMENT='test'
+) ENGINE=MyISAM ROW_FORMAT='fixed' COMMENT='test' COLLATE = utf8_general_ci
 alter table t1 ROW_FORMAT=dynamic;
 show create table t1;
 Table	Create Table
@@ -180,7 +180,7 @@
   `a` int NOT NULL,
   `b` varchar(10) DEFAULT NULL,