Merge lp:~stewart/drizzle/rename-embedded-innodb-to-haildb into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

renames embedded_innodb to HailDB everywhere EXCEPT the plugin name (so that ENGINE=InnoDB still works)

NOTE: after this is merged, we shall have to change the hudson jobs to do --plugin_load=haildb and --suite=haildb

[Stewart Smith (stewart)]

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

=== renamed directory 'plugin/embedded_innodb' => 'plugin/haildb'
=== modified file 'plugin/haildb/config_table_function.cc'
--- plugin/embedded_innodb/config_table_function.cc	2010-08-06 23:03:50 +0000
+++ plugin/haildb/config_table_function.cc	2010-09-30 08:13:47 +0000
@@ -62,7 +62,7 @@
 };
 
 LibInnoDBConfigTool::LibInnoDBConfigTool() :
-  plugin::TableFunction("DATA_DICTIONARY", "INNODB_CONFIGURATION")
+  plugin::TableFunction("DATA_DICTIONARY", "HAILDB_CONFIGURATION")
 {
   add_field("NAME");
   add_field("TYPE");

=== modified file 'plugin/haildb/config_table_function.h'
--- plugin/embedded_innodb/config_table_function.h	2010-05-18 18:20:56 +0000
+++ plugin/haildb/config_table_function.h	2010-09-30 08:13:47 +0000
@@ -16,9 +16,9 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef PLUGIN_EMBEDDED_INNODB_CONFIG_TABLE_FUNCTION_H
-#define PLUGIN_EMBEDDED_INNODB_CONFIG_TABLE_FUNCTION_H
+#ifndef PLUGIN_HAILDB_CONFIG_TABLE_FUNCTION_H
+#define PLUGIN_HAILDB_CONFIG_TABLE_FUNCTION_H
 
 int config_table_function_initialize(drizzled::module::Context &context);
 
-#endif /* PLUGIN_EMBEDDED_INNODB_CONFIG_TABLE_FUNCTION_H */
+#endif /* PLUGIN_HAILDB_CONFIG_TABLE_FUNCTION_H */

=== modified file 'plugin/haildb/datadict_table_message.cc'
--- plugin/embedded_innodb/datadict_table_message.cc	2010-09-24 06:59:20 +0000
+++ plugin/haildb/datadict_table_message.cc	2010-09-30 08:13:47 +0000
@@ -24,20 +24,20 @@
 # include <embedded_innodb-1.0/innodb.h>
 #endif /* HAVE_HAILDB_H */
 
-#include "embedded_innodb_engine.h"
+#include "haildb_engine.h"
 
 #include <drizzled/charset_info.h>
 #include <drizzled/message/table.pb.h>
 
 using namespace drizzled;
 
-int get_innodb_system_table_message(const char* table_name, drizzled::message::Table *table_message)
+int get_haildb_system_table_message(const char* table_name, drizzled::message::Table *table_message)
 {
   if (strcmp(table_name, "SYS_TABLES") == 0)
   {
     message::Engine *engine= table_message->mutable_engine();
     engine->set_name("InnoDB");
-    table_message->set_name("innodb_sys_tables");
+    table_message->set_name("haildb_sys_tables");
     table_message->set_schema("data_dictionary");
     table_message->set_type(message::Table::STANDARD);
     table_message->set_creation_timestamp(0);
@@ -109,7 +109,7 @@
     message::Table::Field::StringFieldOptions *stropt;
     message::Engine *engine= table_message->mutable_engine();
     engine->set_name("InnoDB");
-    table_message->set_name("innodb_sys_columns");
+    table_message->set_name("haildb_sys_columns");
     table_message->set_schema("data_dictionary");
     table_message->set_type(message::Table::STANDARD);
     table_message->set_creation_timestamp(0);
@@ -169,7 +169,7 @@
     message::Table::Field::StringFieldOptions *stropt;
     message::Engine *engine= table_message->mutable_engine();
     engine->set_name("InnoDB");
-    table_message->set_name("innodb_sys_indexes");
+    table_message->set_name("haildb_sys_indexes");
     table_message->set_schema("data_dictionary");
     table_message->set_type(message::Table::STANDARD);
     table_message->set_creation_timestamp(0);
@@ -229,7 +229,7 @@
     message::Table::Field::StringFieldOptions *stropt;
     message::Engine *engine= table_message->mutable_engine();
     engine->set_name("InnoDB");
-    table_message->set_name("innodb_sys_fields");
+    table_message->set_name("haildb_sys_fields");
     table_message->set_schema("data_dictionary");
     table_message->set_type(message::Table::STANDARD);
     table_message->set_creation_timestamp(0);
@@ -273,7 +273,7 @@
     message::Table::Field::StringFieldOptions *stropt;
     message::Engine *engine= table_message->mutable_engine();
     engine->set_name("InnoDB");
-    table_message->set_name("innodb_sys_foreign");
+    table_message->set_name("haildb_sys_foreign");
     table_message->set_schema("data_dictionary");
     table_message->set_type(message::Table::STANDARD);
     table_message->set_creation_timestamp(0);
@@ -341,7 +341,7 @@
     message::Table::Field::StringFieldOptions *stropt;
     message::Engine *engine= table_message->mutable_engine();
     engine->set_name("InnoDB");
-    table_message->set_name("innodb_sys_foreign_cols");
+    table_message->set_name("haildb_sys_foreign_cols");
     table_message->set_schema("data_dictionary");
     table_message->set_type(message::Table::STANDARD);
     table_message->set_creation_timestamp(0);

=== renamed file 'plugin/embedded_innodb/libinnodb_datadict_dump_func.cc' => 'plugin/haildb/haildb_datadict_dump_func.cc'
--- plugin/embedded_innodb/libinnodb_datadict_dump_func.cc	2010-08-06 23:03:50 +0000
+++ plugin/haildb/haildb_datadict_dump_func.cc	2010-09-30 08:13:47 +0000
@@ -21,7 +21,7 @@
 #include <drizzled/item/func.h>
 #include "drizzled/charset.h"
 #include <drizzled/function/str/strfunc.h>
-#include "libinnodb_datadict_dump_func.h"
+#include "haildb_datadict_dump_func.h"
 
 #if defined(HAVE_HAILDB_H)
 # include <haildb.h>
@@ -35,10 +35,10 @@
 using namespace std;
 using namespace drizzled;
 
-class LibinnodbDatadictDumpFunction : public Item_str_func
+class HailDBDatadictDumpFunction : public Item_str_func
 {
 public:
-  LibinnodbDatadictDumpFunction() : Item_str_func() {}
+  HailDBDatadictDumpFunction() : Item_str_func() {}
   String *val_str(String*);
 
   void fix_length_and_dec()
@@ -48,7 +48,7 @@
 
   const char *func_name() const
   {
-    return "libinnodb_datadict_dump";
+    return "haildb_datadict_dump";
   }
 
   bool check_argument_count(int n)
@@ -163,7 +163,7 @@
 }
 
 }
-String *LibinnodbDatadictDumpFunction::val_str(String *str)
+String *HailDBDatadictDumpFunction::val_str(String *str)
 {
   assert(fixed == true);
 
@@ -175,7 +175,7 @@
 
   null_value= false;
 
-  string dict_dump("InnoDB Data Dictionary Contents\n"
+  string dict_dump("HailDB Data Dictionary Contents\n"
                    "-------------------------------\n");
 
   struct schema_visitor_arg arg;
@@ -199,11 +199,11 @@
 }
 
 
-plugin::Create_function<LibinnodbDatadictDumpFunction> *libinnodb_datadict_dump_func= NULL;
+plugin::Create_function<HailDBDatadictDumpFunction> *haildb_datadict_dump_func= NULL;
 
-int libinnodb_datadict_dump_func_initialize(module::Context &context)
+int haildb_datadict_dump_func_initialize(module::Context &context)
 {
-  libinnodb_datadict_dump_func= new plugin::Create_function<LibinnodbDatadictDumpFunction>("libinnodb_datadict_dump");
-  context.add(libinnodb_datadict_dump_func);
+  haildb_datadict_dump_func= new plugin::Create_function<HailDBDatadictDumpFunction>("haildb_datadict_dump");
+  context.add(haildb_datadict_dump_func);
   return 0;
 }

=== renamed file 'plugin/embedded_innodb/libinnodb_datadict_dump_func.h' => 'plugin/haildb/haildb_datadict_dump_func.h'
--- plugin/embedded_innodb/libinnodb_datadict_dump_func.h	2010-05-18 18:20:56 +0000
+++ plugin/haildb/haildb_datadict_dump_func.h	2010-09-30 08:13:47 +0000
@@ -16,9 +16,9 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef PLUGIN_EMBEDDED_INNODB_LIBINNODB_DATADICT_DUMP_FUNC_H
-#define PLUGIN_EMBEDDED_INNODB_LIBINNODB_DATADICT_DUMP_FUNC_H
-
-int libinnodb_datadict_dump_func_initialize(drizzled::module::Context &context);
-
-#endif /* PLUGIN_EMBEDDED_INNODB_LIBINNODB_DATADICT_DUMP_FUNC_H */
+#ifndef PLUGIN_HAILDB_HAILDB_DATADICT_DUMP_FUNC_H
+#define PLUGIN_HAILDB_HAILDB_DATADICT_DUMP_FUNC_H
+
+int haildb_datadict_dump_func_initialize(drizzled::module::Context &context);
+
+#endif /* PLUGIN_HAILDB_HAILDB_DATADICT_DUMP_FUNC_H */

=== renamed file 'plugin/embedded_innodb/embedded_innodb_engine.cc' => 'plugin/haildb/haildb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc	2010-09-28 21:16:58 +0000
+++ plugin/haildb/haildb_engine.cc	2010-09-30 08:13:47 +0000
@@ -90,8 +90,8 @@
 
 #include "drizzled/global_charset_info.h"
 
-#include "libinnodb_version_func.h"
-#include "libinnodb_datadict_dump_func.h"
+#include "haildb_version_func.h"
+#include "haildb_datadict_dump_func.h"
 #include "config_table_function.h"
 #include "status_table_function.h"
 
@@ -101,7 +101,7 @@
 # include <embedded_innodb-1.0/innodb.h>
 #endif /* HAVE_HAILDB_H */
 
-#include "embedded_innodb_engine.h"
+#include "haildb_engine.h"
 
 #include <drizzled/field.h>
 #include "drizzled/field/timestamp.h" // needed for UPDATE NOW()
@@ -120,29 +120,29 @@
 using namespace google;
 using namespace drizzled;
 
-int read_row_from_innodb(unsigned char* buf, ib_crsr_t cursor, ib_tpl_t tuple, Table* table, bool has_hidden_primary_key, uint64_t *hidden_pkey, drizzled::memory::Root **blobroot= NULL);
+int read_row_from_haildb(unsigned char* buf, ib_crsr_t cursor, ib_tpl_t tuple, Table* table, bool has_hidden_primary_key, uint64_t *hidden_pkey, drizzled::memory::Root **blobroot= NULL);
 static void fill_ib_search_tpl_from_drizzle_key(ib_tpl_t search_tuple,
                                                 const drizzled::KeyInfo *key_info,
                                                 const unsigned char *key_ptr,
                                                 uint32_t key_len);
-static void store_key_value_from_innodb(KeyInfo *key_info, unsigned char* ref, int ref_len, const unsigned char *record);
-
-#define EMBEDDED_INNODB_EXT ".EID"
-
-const char INNODB_TABLE_DEFINITIONS_TABLE[]= "data_dictionary/innodb_table_definitions";
+static void store_key_value_from_haildb(KeyInfo *key_info, unsigned char* ref, int ref_len, const unsigned char *record);
+
+#define HAILDB_EXT ".EID"
+
+const char HAILDB_TABLE_DEFINITIONS_TABLE[]= "data_dictionary/haildb_table_definitions";
 const string statement_savepoint_name("STATEMENT");
 
-static boost::unordered_set<std::string> innodb_system_table_names;
-
-
-static const char *EmbeddedInnoDBCursor_exts[] = {
+static boost::unordered_set<std::string> haildb_system_table_names;
+
+
+static const char *HailDBCursor_exts[] = {
   NULL
 };
 
-class EmbeddedInnoDBEngine : public drizzled::plugin::TransactionalStorageEngine
+class HailDBEngine : public drizzled::plugin::TransactionalStorageEngine
 {
 public:
-  EmbeddedInnoDBEngine(const string &name_arg)
+  HailDBEngine(const string &name_arg)
    : drizzled::plugin::TransactionalStorageEngine(name_arg,
                                                   HTON_NULL_IN_KEY |
                                                   HTON_CAN_INDEX_BLOBS |
@@ -150,18 +150,18 @@
                                                   HTON_PARTIAL_COLUMN_READ |
                                                   HTON_HAS_DOES_TRANSACTIONS)
   {
-    table_definition_ext= EMBEDDED_INNODB_EXT;
+    table_definition_ext= HAILDB_EXT;
   }
 
-  ~EmbeddedInnoDBEngine();
+  ~HailDBEngine();
 
   virtual Cursor *create(TableShare &table)
   {
-    return new EmbeddedInnoDBCursor(*this, table);
+    return new HailDBCursor(*this, table);
   }
 
   const char **bas_ext() const {
-    return EmbeddedInnoDBCursor_exts;
+    return HailDBCursor_exts;
   }
 
   bool validateCreateTableOption(const std::string &key,
@@ -185,7 +185,7 @@
   bool doDoesTableExist(Session&, const TableIdentifier &identifier);
 
 private:
-  void getTableNamesInSchemaFromInnoDB(const drizzled::SchemaIdentifier &schema,
+  void getTableNamesInSchemaFromHailDB(const drizzled::SchemaIdentifier &schema,
                                        drizzled::plugin::TableNameList *set_of_names,
                                        drizzled::TableIdentifiers *identifiers);
 
@@ -221,23 +221,23 @@
   virtual int doCommit(Session* session, bool all);
   virtual int doRollback(Session* session, bool all);
 
-  typedef std::map<std::string, EmbeddedInnoDBTableShare*> EmbeddedInnoDBMap;
-  EmbeddedInnoDBMap embedded_innodb_open_tables;
-  EmbeddedInnoDBTableShare *findOpenTable(const std::string table_name);
-  void addOpenTable(const std::string &table_name, EmbeddedInnoDBTableShare *);
+  typedef std::map<std::string, HailDBTableShare*> HailDBMap;
+  HailDBMap haildb_open_tables;
+  HailDBTableShare *findOpenTable(const std::string table_name);
+  void addOpenTable(const std::string &table_name, HailDBTableShare *);
   void deleteOpenTable(const std::string &table_name);
 
-  uint64_t getInitialAutoIncrementValue(EmbeddedInnoDBCursor *cursor);
-  uint64_t getHiddenPrimaryKeyInitialAutoIncrementValue(EmbeddedInnoDBCursor *cursor);
+  uint64_t getInitialAutoIncrementValue(HailDBCursor *cursor);
+  uint64_t getHiddenPrimaryKeyInitialAutoIncrementValue(HailDBCursor *cursor);
 
 };
 
-static drizzled::plugin::StorageEngine *embedded_innodb_engine= NULL;
+static drizzled::plugin::StorageEngine *haildb_engine= NULL;
 
 
 static ib_trx_t* get_trx(Session* session)
 {
-  return (ib_trx_t*) session->getEngineData(embedded_innodb_engine);
+  return (ib_trx_t*) session->getEngineData(haildb_engine);
 }
 
 /* This is a superset of the map from innobase plugin.
@@ -345,7 +345,7 @@
   return IB_TRX_REPEATABLE_READ;
 }
 
-int EmbeddedInnoDBEngine::doStartTransaction(Session *session,
+int HailDBEngine::doStartTransaction(Session *session,
                                              start_transaction_option_t options)
 {
   ib_trx_t *transaction;
@@ -360,7 +360,7 @@
   return 0;
 }
 
-void EmbeddedInnoDBEngine::doStartStatement(Session *session)
+void HailDBEngine::doStartStatement(Session *session)
 {
   if(*get_trx(session) == NULL)
     doStartTransaction(session, START_TRANS_NO_OPTIONS);
@@ -369,12 +369,12 @@
                     statement_savepoint_name.length());
 }
 
-void EmbeddedInnoDBEngine::doEndStatement(Session *session)
+void HailDBEngine::doEndStatement(Session *session)
 {
   doCommit(session, false);
 }
 
-int EmbeddedInnoDBEngine::doSetSavepoint(Session* session,
+int HailDBEngine::doSetSavepoint(Session* session,
                                          drizzled::NamedSavepoint &savepoint)
 {
   ib_trx_t *transaction= get_trx(session);
@@ -383,7 +383,7 @@
   return 0;
 }
 
-int EmbeddedInnoDBEngine::doRollbackToSavepoint(Session* session,
+int HailDBEngine::doRollbackToSavepoint(Session* session,
                                                 drizzled::NamedSavepoint &savepoint)
 {
   ib_trx_t *transaction= get_trx(session);
@@ -395,7 +395,7 @@
   return ib_err_t_to_drizzle_error(err);
 }
 
-int EmbeddedInnoDBEngine::doReleaseSavepoint(Session* session,
+int HailDBEngine::doReleaseSavepoint(Session* session,
                                              drizzled::NamedSavepoint &savepoint)
 {
   ib_trx_t *transaction= get_trx(session);
@@ -409,7 +409,7 @@
   return 0;
 }
 
-int EmbeddedInnoDBEngine::doCommit(Session* session, bool all)
+int HailDBEngine::doCommit(Session* session, bool all)
 {
   ib_err_t err;
   ib_trx_t *transaction= get_trx(session);
@@ -427,7 +427,7 @@
   return 0;
 }
 
-int EmbeddedInnoDBEngine::doRollback(Session* session, bool all)
+int HailDBEngine::doRollback(Session* session, bool all)
 {
   ib_err_t err;
   ib_trx_t *transaction= get_trx(session);
@@ -452,30 +452,30 @@
   return 0;
 }
 
-EmbeddedInnoDBTableShare *EmbeddedInnoDBEngine::findOpenTable(const string table_name)
+HailDBTableShare *HailDBEngine::findOpenTable(const string table_name)
 {
-  EmbeddedInnoDBMap::iterator find_iter=
-    embedded_innodb_open_tables.find(table_name);
+  HailDBMap::iterator find_iter=
+    haildb_open_tables.find(table_name);
 
-  if (find_iter != embedded_innodb_open_tables.end())
+  if (find_iter != haildb_open_tables.end())
     return (*find_iter).second;
   else
     return NULL;
 }
 
-void EmbeddedInnoDBEngine::addOpenTable(const string &table_name, EmbeddedInnoDBTableShare *share)
-{
-  embedded_innodb_open_tables[table_name]= share;
-}
-
-void EmbeddedInnoDBEngine::deleteOpenTable(const string &table_name)
-{
-  embedded_innodb_open_tables.erase(table_name);
-}
-
-static pthread_mutex_t embedded_innodb_mutex= PTHREAD_MUTEX_INITIALIZER;
-
-uint64_t EmbeddedInnoDBCursor::getHiddenPrimaryKeyInitialAutoIncrementValue()
+void HailDBEngine::addOpenTable(const string &table_name, HailDBTableShare *share)
+{
+  haildb_open_tables[table_name]= share;
+}
+
+void HailDBEngine::deleteOpenTable(const string &table_name)
+{
+  haildb_open_tables.erase(table_name);
+}
+
+static pthread_mutex_t haildb_mutex= PTHREAD_MUTEX_INITIALIZER;
+
+uint64_t HailDBCursor::getHiddenPrimaryKeyInitialAutoIncrementValue()
 {
   uint64_t nr;
   ib_err_t err;
@@ -499,7 +499,7 @@
   return nr;
 }
 
-uint64_t EmbeddedInnoDBCursor::getInitialAutoIncrementValue()
+uint64_t HailDBCursor::getInitialAutoIncrementValue()
 {
   uint64_t nr;
   int error;
@@ -536,13 +536,13 @@
   return nr;
 }
 
-EmbeddedInnoDBTableShare::EmbeddedInnoDBTableShare(const char* name, bool hidden_primary_key)
+HailDBTableShare::HailDBTableShare(const char* name, bool hidden_primary_key)
   : use_count(0), has_hidden_primary_key(hidden_primary_key)
 {
   table_name.assign(name);
 }
 
-uint64_t EmbeddedInnoDBEngine::getInitialAutoIncrementValue(EmbeddedInnoDBCursor *cursor)
+uint64_t HailDBEngine::getInitialAutoIncrementValue(HailDBCursor *cursor)
 {
   doStartTransaction(current_session, START_TRANS_NO_OPTIONS);
   uint64_t initial_auto_increment_value= cursor->getInitialAutoIncrementValue();
@@ -551,7 +551,7 @@
   return initial_auto_increment_value;
 }
 
-uint64_t EmbeddedInnoDBEngine::getHiddenPrimaryKeyInitialAutoIncrementValue(EmbeddedInnoDBCursor *cursor)
+uint64_t HailDBEngine::getHiddenPrimaryKeyInitialAutoIncrementValue(HailDBCursor *cursor)
 {
   doStartTransaction(current_session, START_TRANS_NO_OPTIONS);
   uint64_t initial_auto_increment_value= cursor->getHiddenPrimaryKeyInitialAutoIncrementValue();
@@ -560,20 +560,20 @@
   return initial_auto_increment_value;
 }
 
-EmbeddedInnoDBTableShare *EmbeddedInnoDBCursor::get_share(const char *table_name, bool has_hidden_primary_key, int *rc)
+HailDBTableShare *HailDBCursor::get_share(const char *table_name, bool has_hidden_primary_key, int *rc)
 {
-  pthread_mutex_lock(&embedded_innodb_mutex);
+  pthread_mutex_lock(&haildb_mutex);
 
-  EmbeddedInnoDBEngine *a_engine= static_cast<EmbeddedInnoDBEngine *>(engine);
+  HailDBEngine *a_engine= static_cast<HailDBEngine *>(engine);
   share= a_engine->findOpenTable(table_name);
 
   if (!share)
   {
-    share= new EmbeddedInnoDBTableShare(table_name, has_hidden_primary_key);
+    share= new HailDBTableShare(table_name, has_hidden_primary_key);
 
     if (share == NULL)
     {
-      pthread_mutex_unlock(&embedded_innodb_mutex);
+      pthread_mutex_unlock(&haildb_mutex);
       *rc= HA_ERR_OUT_OF_MEM;
       return(NULL);
     }
@@ -597,27 +597,27 @@
   }
   share->use_count++;
 
-  pthread_mutex_unlock(&embedded_innodb_mutex);
+  pthread_mutex_unlock(&haildb_mutex);
 
   return(share);
 }
 
-int EmbeddedInnoDBCursor::free_share()
+int HailDBCursor::free_share()
 {
-  pthread_mutex_lock(&embedded_innodb_mutex);
+  pthread_mutex_lock(&haildb_mutex);
   if (!--share->use_count)
   {
-    EmbeddedInnoDBEngine *a_engine= static_cast<EmbeddedInnoDBEngine *>(engine);
+    HailDBEngine *a_engine= static_cast<HailDBEngine *>(engine);
     a_engine->deleteOpenTable(share->table_name);
     delete share;
   }
-  pthread_mutex_unlock(&embedded_innodb_mutex);
+  pthread_mutex_unlock(&haildb_mutex);
 
   return 0;
 }
 
 
-THR_LOCK_DATA **EmbeddedInnoDBCursor::store_lock(Session *session,
+THR_LOCK_DATA **HailDBCursor::store_lock(Session *session,
                                                  THR_LOCK_DATA **to,
                                                  thr_lock_type lock_type)
 {
@@ -632,7 +632,7 @@
 
   if(*get_trx(session) == NULL)
   {
-    static_cast<EmbeddedInnoDBEngine*>(getEngine())->
+    static_cast<HailDBEngine*>(getEngine())->
                     doStartTransaction(session, START_TRANS_NO_OPTIONS);
   }
 
@@ -745,7 +745,7 @@
   return to;
 }
 
-void EmbeddedInnoDBCursor::get_auto_increment(uint64_t, //offset,
+void HailDBCursor::get_auto_increment(uint64_t, //offset,
                                               uint64_t, //increment,
                                               uint64_t, //nb_dis,
                                               uint64_t *first_value,
@@ -766,19 +766,19 @@
   *nb_reserved_values= 1;
 }
 
-static const char* table_path_to_innodb_name(const char* name)
+static const char* table_path_to_haildb_name(const char* name)
 {
   size_t l= strlen(name);
   static string datadict_path("data_dictionary/");
-  static string sys_prefix("data_dictionary/innodb_");
-  static string sys_table_prefix("INNODB_");
+  static string sys_prefix("data_dictionary/haildb_");
+  static string sys_table_prefix("HAILDB_");
 
   if (strncmp(name, sys_prefix.c_str(), sys_prefix.length()) == 0)
   {
     string find_name(name+datadict_path.length());
     std::transform(find_name.begin(), find_name.end(), find_name.begin(), ::toupper);
-    boost::unordered_set<string>::iterator iter= innodb_system_table_names.find(find_name);
-    if (iter != innodb_system_table_names.end())
+    boost::unordered_set<string>::iterator iter= haildb_system_table_names.find(find_name);
+    if (iter != haildb_system_table_names.end())
       return (*iter).c_str()+sys_table_prefix.length();
   }
 
@@ -795,12 +795,12 @@
   return &name[l];
 }
 
-static void TableIdentifier_to_innodb_name(const TableIdentifier &identifier, std::string *str)
+static void TableIdentifier_to_haildb_name(const TableIdentifier &identifier, std::string *str)
 {
-  str->assign(table_path_to_innodb_name(identifier.getPath().c_str()));
+  str->assign(table_path_to_haildb_name(identifier.getPath().c_str()));
 }
 
-EmbeddedInnoDBCursor::EmbeddedInnoDBCursor(drizzled::plugin::StorageEngine &engine_arg,
+HailDBCursor::HailDBCursor(drizzled::plugin::StorageEngine &engine_arg,
                            TableShare &table_arg)
   :Cursor(engine_arg, table_arg),
    ib_lock_mode(IB_LOCK_NONE),
@@ -821,17 +821,17 @@
   return 0;
 }
 
-int EmbeddedInnoDBCursor::open(const char *name, int, uint32_t)
+int HailDBCursor::open(const char *name, int, uint32_t)
 {
-  const char* innodb_table_name= table_path_to_innodb_name(name);
-  ib_err_t err= ib_cursor_open_table(innodb_table_name, NULL, &cursor);
+  const char* haildb_table_name= table_path_to_haildb_name(name);
+  ib_err_t err= ib_cursor_open_table(haildb_table_name, NULL, &cursor);
   bool has_hidden_primary_key= false;
   ib_id_t idx_id;
 
   if (err != DB_SUCCESS)
     return ib_err_t_to_drizzle_error(err);
 
-  err= ib_index_get_id(innodb_table_name, "HIDDEN_PRIMARY", &idx_id);
+  err= ib_index_get_id(haildb_table_name, "HIDDEN_PRIMARY", &idx_id);
 
   if (err == DB_SUCCESS)
     has_hidden_primary_key= true;
@@ -856,7 +856,7 @@
   return(0);
 }
 
-int EmbeddedInnoDBCursor::close(void)
+int HailDBCursor::close(void)
 {
   ib_err_t err= ib_cursor_close(cursor);
   if (err != DB_SUCCESS)
@@ -870,7 +870,7 @@
   return 0;
 }
 
-int EmbeddedInnoDBCursor::external_lock(Session* session, int lock_type)
+int HailDBCursor::external_lock(Session* session, int lock_type)
 {
   ib_cursor_stmt_begin(cursor);
 
@@ -951,7 +951,7 @@
   ib_err_t err;
   string serialized_message;
 
-  err= ib_cursor_open_table(INNODB_TABLE_DEFINITIONS_TABLE, transaction, &cursor);
+  err= ib_cursor_open_table(HAILDB_TABLE_DEFINITIONS_TABLE, transaction, &cursor);
   if (err != DB_SUCCESS)
     return err;
 
@@ -986,7 +986,7 @@
   return err;
 }
 
-bool EmbeddedInnoDBEngine::validateCreateTableOption(const std::string &key,
+bool HailDBEngine::validateCreateTableOption(const std::string &key,
                                                      const std::string &state)
 {
   if (boost::iequals(key, "ROW_FORMAT"))
@@ -1022,17 +1022,17 @@
   return IB_TBL_COMPACT;
 }
 
-int EmbeddedInnoDBEngine::doCreateTable(Session &session,
+int HailDBEngine::doCreateTable(Session &session,
                                         Table& table_obj,
                                         const drizzled::TableIdentifier &identifier,
                                         drizzled::message::Table& table_message)
 {
-  ib_tbl_sch_t innodb_table_schema= NULL;
-//  ib_idx_sch_t innodb_pkey= NULL;
-  ib_trx_t innodb_schema_transaction;
-  ib_id_t innodb_table_id;
-  ib_err_t innodb_err= DB_SUCCESS;
-  string innodb_table_name;
+  ib_tbl_sch_t haildb_table_schema= NULL;
+//  ib_idx_sch_t haildb_pkey= NULL;
+  ib_trx_t haildb_schema_transaction;
+  ib_id_t haildb_table_id;
+  ib_err_t haildb_err= DB_SUCCESS;
+  string haildb_table_name;
   bool has_explicit_pkey= false;
 
   (void)table_obj;
@@ -1044,9 +1044,9 @@
       return -1;
   }
 
-  TableIdentifier_to_innodb_name(identifier, &innodb_table_name);
+  TableIdentifier_to_haildb_name(identifier, &haildb_table_name);
 
-  ib_tbl_fmt_t innodb_table_format= IB_TBL_COMPACT;
+  ib_tbl_fmt_t haildb_table_format= IB_TBL_COMPACT;
 
   const size_t num_engine_options= table_message.engine().options_size();
   for (size_t x= 0; x < num_engine_options; x++)
@@ -1054,42 +1054,42 @@
     const message::Engine::Option &engine_option= table_message.engine().options(x);
     if (boost::iequals(engine_option.name(), "ROW_FORMAT"))
     {
-      innodb_table_format= parse_ib_table_format(engine_option.state());
+      haildb_table_format= parse_ib_table_format(engine_option.state());
     }
   }
 
-  innodb_err= ib_table_schema_create(innodb_table_name.c_str(),
-                                     &innodb_table_schema,
-                                     innodb_table_format, 0);
+  haildb_err= ib_table_schema_create(haildb_table_name.c_str(),
+                                     &haildb_table_schema,
+                                     haildb_table_format, 0);
 
-  if (innodb_err != DB_SUCCESS)
+  if (haildb_err != DB_SUCCESS)
   {
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_CREATE_TABLE,
-                        _("Cannot create table %s. InnoDB Error %d (%s)\n"),
-                        innodb_table_name.c_str(), innodb_err, ib_strerror(innodb_err));
-    return ib_err_t_to_drizzle_error(innodb_err);
+                        _("Cannot create table %s. HailDB Error %d (%s)\n"),
+                        haildb_table_name.c_str(), haildb_err, ib_strerror(haildb_err));
+    return ib_err_t_to_drizzle_error(haildb_err);
   }
 
   for (int colnr= 0; colnr < table_message.field_size() ; colnr++)
   {
     const message::Table::Field field = table_message.field(colnr);
 
-    int field_err= create_table_add_field(innodb_table_schema, field,
-                                          &innodb_err);
-
-    if (innodb_err != DB_SUCCESS || field_err != 0)
-      ib_table_schema_delete(innodb_table_schema); /* cleanup */
-
-    if (innodb_err != DB_SUCCESS)
+    int field_err= create_table_add_field(haildb_table_schema, field,
+                                          &haildb_err);
+
+    if (haildb_err != DB_SUCCESS || field_err != 0)
+      ib_table_schema_delete(haildb_table_schema); /* cleanup */
+
+    if (haildb_err != DB_SUCCESS)
     {
       push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                           ER_CANT_CREATE_TABLE,
                           _("Cannot create field %s on table %s."
-                            " InnoDB Error %d (%s)\n"),
-                          field.name().c_str(), innodb_table_name.c_str(),
-                          innodb_err, ib_strerror(innodb_err));
-      return ib_err_t_to_drizzle_error(innodb_err);
+                            " HailDB Error %d (%s)\n"),
+                          field.name().c_str(), haildb_table_name.c_str(),
+                          haildb_err, ib_strerror(haildb_err));
+      return ib_err_t_to_drizzle_error(haildb_err);
     }
     if (field_err != 0)
       return field_err;
@@ -1100,26 +1100,26 @@
   {
     message::Table::Index *index = table_message.mutable_indexes(indexnr);
 
-    ib_idx_sch_t innodb_index;
+    ib_idx_sch_t haildb_index;
 
-    innodb_err= ib_table_schema_add_index(innodb_table_schema, index->name().c_str(),
-                                   &innodb_index);
-    if (innodb_err != DB_SUCCESS)
+    haildb_err= ib_table_schema_add_index(haildb_table_schema, index->name().c_str(),
+                                   &haildb_index);
+    if (haildb_err != DB_SUCCESS)
       goto schema_error;
 
     if (index->is_primary())
     {
       has_primary= true;
-      innodb_err= ib_index_schema_set_clustered(innodb_index);
+      haildb_err= ib_index_schema_set_clustered(haildb_index);
       has_explicit_pkey= true;
-      if (innodb_err != DB_SUCCESS)
+      if (haildb_err != DB_SUCCESS)
         goto schema_error;
     }
 
     if (index->is_unique())
     {
-      innodb_err= ib_index_schema_set_unique(innodb_index);
-      if (innodb_err != DB_SUCCESS)
+      haildb_err= ib_index_schema_set_unique(haildb_index);
+      if (haildb_err != DB_SUCCESS)
         goto schema_error;
     }
 
@@ -1136,18 +1136,18 @@
           || part_type == message::Table::Field::VARCHAR)
         compare_length= part.compare_length();
 
-      innodb_err= ib_index_schema_add_col(innodb_index,
+      haildb_err= ib_index_schema_add_col(haildb_index,
                             table_message.field(part.fieldnr()).name().c_str(),
                                           compare_length);
-      if (innodb_err != DB_SUCCESS)
+      if (haildb_err != DB_SUCCESS)
         goto schema_error;
     }
 
     if (! has_primary && index->is_unique())
     {
-      innodb_err= ib_index_schema_set_clustered(innodb_index);
+      haildb_err= ib_index_schema_set_clustered(haildb_index);
       has_explicit_pkey= true;
-      if (innodb_err != DB_SUCCESS)
+      if (haildb_err != DB_SUCCESS)
         goto schema_error;
     }
 
@@ -1155,58 +1155,58 @@
 
   if (! has_explicit_pkey)
   {
-    ib_idx_sch_t innodb_index;
+    ib_idx_sch_t haildb_index;
 
-    innodb_err= ib_table_schema_add_col(innodb_table_schema, "hidden_primary_key_col",
+    haildb_err= ib_table_schema_add_col(haildb_table_schema, "hidden_primary_key_col",
                                         IB_INT, IB_COL_NOT_NULL, 0, 8);
 
-    innodb_err= ib_table_schema_add_index(innodb_table_schema, "HIDDEN_PRIMARY",
-                                          &innodb_index);
-    if (innodb_err != DB_SUCCESS)
-      goto schema_error;
-
-    innodb_err= ib_index_schema_set_clustered(innodb_index);
-    if (innodb_err != DB_SUCCESS)
-      goto schema_error;
-
-    innodb_err= ib_index_schema_add_col(innodb_index, "hidden_primary_key_col", 0);
-    if (innodb_err != DB_SUCCESS)
+    haildb_err= ib_table_schema_add_index(haildb_table_schema, "HIDDEN_PRIMARY",
+                                          &haildb_index);
+    if (haildb_err != DB_SUCCESS)
+      goto schema_error;
+
+    haildb_err= ib_index_schema_set_clustered(haildb_index);
+    if (haildb_err != DB_SUCCESS)
+      goto schema_error;
+
+    haildb_err= ib_index_schema_add_col(haildb_index, "hidden_primary_key_col", 0);
+    if (haildb_err != DB_SUCCESS)
       goto schema_error;
   }
 
-  innodb_schema_transaction= ib_trx_begin(IB_TRX_REPEATABLE_READ);
-  innodb_err= ib_schema_lock_exclusive(innodb_schema_transaction);
-  if (innodb_err != DB_SUCCESS)
+  haildb_schema_transaction= ib_trx_begin(IB_TRX_REPEATABLE_READ);
+  haildb_err= ib_schema_lock_exclusive(haildb_schema_transaction);
+  if (haildb_err != DB_SUCCESS)
   {
-    ib_err_t rollback_err= ib_trx_rollback(innodb_schema_transaction);
-    ib_table_schema_delete(innodb_table_schema);
+    ib_err_t rollback_err= ib_trx_rollback(haildb_schema_transaction);
+    ib_table_schema_delete(haildb_table_schema);
 
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_CREATE_TABLE,
-                        _("Cannot Lock Embedded InnoDB Data Dictionary. InnoDB Error %d (%s)\n"),
-                        innodb_err, ib_strerror(innodb_err));
+                        _("Cannot Lock HailDB Data Dictionary. HailDB Error %d (%s)\n"),
+                        haildb_err, ib_strerror(haildb_err));
 
     assert (rollback_err == DB_SUCCESS);
 
     return HA_ERR_GENERIC;
   }
 
-  innodb_err= ib_table_create(innodb_schema_transaction, innodb_table_schema,
-                              &innodb_table_id);
+  haildb_err= ib_table_create(haildb_schema_transaction, haildb_table_schema,
+                              &haildb_table_id);
 
-  if (innodb_err != DB_SUCCESS)
+  if (haildb_err != DB_SUCCESS)
   {
-    ib_err_t rollback_err= ib_trx_rollback(innodb_schema_transaction);
-    ib_table_schema_delete(innodb_table_schema);
+    ib_err_t rollback_err= ib_trx_rollback(haildb_schema_transaction);
+    ib_table_schema_delete(haildb_table_schema);
 
-    if (innodb_err == DB_TABLE_IS_BEING_USED)
+    if (haildb_err == DB_TABLE_IS_BEING_USED)
       return EEXIST;
 
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_CREATE_TABLE,
-                        _("Cannot create table %s. InnoDB Error %d (%s)\n"),
-                        innodb_table_name.c_str(),
-                        innodb_err, ib_strerror(innodb_err));
+                        _("Cannot create table %s. HailDB Error %d (%s)\n"),
+                        haildb_table_name.c_str(),
+                        haildb_err, ib_strerror(haildb_err));
 
     assert (rollback_err == DB_SUCCESS);
     return HA_ERR_GENERIC;
@@ -1215,42 +1215,42 @@
   if (table_message.type() == message::Table::TEMPORARY)
   {
     session.storeTableMessage(identifier, table_message);
-    innodb_err= DB_SUCCESS;
+    haildb_err= DB_SUCCESS;
   }
   else
-    innodb_err= store_table_message(innodb_schema_transaction,
-                                    innodb_table_name.c_str(),
+    haildb_err= store_table_message(haildb_schema_transaction,
+                                    haildb_table_name.c_str(),
                                     table_message);
 
-  if (innodb_err == DB_SUCCESS)
-    innodb_err= ib_trx_commit(innodb_schema_transaction);
+  if (haildb_err == DB_SUCCESS)
+    haildb_err= ib_trx_commit(haildb_schema_transaction);
   else
-    innodb_err= ib_trx_rollback(innodb_schema_transaction);
+    haildb_err= ib_trx_rollback(haildb_schema_transaction);
 
 schema_error:
-  ib_table_schema_delete(innodb_table_schema);
+  ib_table_schema_delete(haildb_table_schema);
 
-  if (innodb_err != DB_SUCCESS)
+  if (haildb_err != DB_SUCCESS)
   {
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_CREATE_TABLE,
-                        _("Cannot create table %s. InnoDB Error %d (%s)\n"),
-                        innodb_table_name.c_str(),
-                        innodb_err, ib_strerror(innodb_err));
-    return ib_err_t_to_drizzle_error(innodb_err);
+                        _("Cannot create table %s. HailDB Error %d (%s)\n"),
+                        haildb_table_name.c_str(),
+                        haildb_err, ib_strerror(haildb_err));
+    return ib_err_t_to_drizzle_error(haildb_err);
   }
 
   return 0;
 }
 
-static int delete_table_message_from_innodb(ib_trx_t transaction, const char* table_name)
+static int delete_table_message_from_haildb(ib_trx_t transaction, const char* table_name)
 {
   ib_crsr_t cursor;
   ib_tpl_t search_tuple;
   int res;
   ib_err_t err;
 
-  err= ib_cursor_open_table(INNODB_TABLE_DEFINITIONS_TABLE, transaction, &cursor);
+  err= ib_cursor_open_table(HAILDB_TABLE_DEFINITIONS_TABLE, transaction, &cursor);
   if (err != DB_SUCCESS)
     return err;
 
@@ -1279,25 +1279,25 @@
   return err;
 }
 
-int EmbeddedInnoDBEngine::doDropTable(Session &session,
+int HailDBEngine::doDropTable(Session &session,
                                       const TableIdentifier &identifier)
 {
-  ib_trx_t innodb_schema_transaction;
-  ib_err_t innodb_err;
-  string innodb_table_name;
-
-  TableIdentifier_to_innodb_name(identifier, &innodb_table_name);
-
-  innodb_schema_transaction= ib_trx_begin(IB_TRX_REPEATABLE_READ);
-  innodb_err= ib_schema_lock_exclusive(innodb_schema_transaction);
-  if (innodb_err != DB_SUCCESS)
+  ib_trx_t haildb_schema_transaction;
+  ib_err_t haildb_err;
+  string haildb_table_name;
+
+  TableIdentifier_to_haildb_name(identifier, &haildb_table_name);
+
+  haildb_schema_transaction= ib_trx_begin(IB_TRX_REPEATABLE_READ);
+  haildb_err= ib_schema_lock_exclusive(haildb_schema_transaction);
+  if (haildb_err != DB_SUCCESS)
   {
-    ib_err_t rollback_err= ib_trx_rollback(innodb_schema_transaction);
+    ib_err_t rollback_err= ib_trx_rollback(haildb_schema_transaction);
 
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_DELETE_FILE,
-                        _("Cannot Lock Embedded InnoDB Data Dictionary. InnoDB Error %d (%s)\n"),
-                        innodb_err, ib_strerror(innodb_err));
+                        _("Cannot Lock HailDB Data Dictionary. HailDB Error %d (%s)\n"),
+                        haildb_err, ib_strerror(haildb_err));
 
     assert (rollback_err == DB_SUCCESS);
 
@@ -1307,53 +1307,53 @@
   if (identifier.getType() == message::Table::TEMPORARY)
   {
       session.removeTableMessage(identifier);
-      delete_table_message_from_innodb(innodb_schema_transaction,
-                                       innodb_table_name.c_str());
+      delete_table_message_from_haildb(haildb_schema_transaction,
+                                       haildb_table_name.c_str());
   }
   else
   {
-    if (delete_table_message_from_innodb(innodb_schema_transaction, innodb_table_name.c_str()) != DB_SUCCESS)
+    if (delete_table_message_from_haildb(haildb_schema_transaction, haildb_table_name.c_str()) != DB_SUCCESS)
     {
-      ib_schema_unlock(innodb_schema_transaction);
-      ib_err_t rollback_err= ib_trx_rollback(innodb_schema_transaction);
+      ib_schema_unlock(haildb_schema_transaction);
+      ib_err_t rollback_err= ib_trx_rollback(haildb_schema_transaction);
       assert(rollback_err == DB_SUCCESS);
       return HA_ERR_GENERIC;
     }
   }
 
-  innodb_err= ib_table_drop(innodb_schema_transaction, innodb_table_name.c_str());
+  haildb_err= ib_table_drop(haildb_schema_transaction, haildb_table_name.c_str());
 
-  if (innodb_err == DB_TABLE_NOT_FOUND)
+  if (haildb_err == DB_TABLE_NOT_FOUND)
   {
-    innodb_err= ib_trx_rollback(innodb_schema_transaction);
-    assert(innodb_err == DB_SUCCESS);
+    haildb_err= ib_trx_rollback(haildb_schema_transaction);
+    assert(haildb_err == DB_SUCCESS);
     return ENOENT;
   }
-  else if (innodb_err != DB_SUCCESS)
+  else if (haildb_err != DB_SUCCESS)
   {
-    ib_err_t rollback_err= ib_trx_rollback(innodb_schema_transaction);
+    ib_err_t rollback_err= ib_trx_rollback(haildb_schema_transaction);
 
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_DELETE_FILE,
-                        _("Cannot DROP table %s. InnoDB Error %d (%s)\n"),
-                        innodb_table_name.c_str(),
-                        innodb_err, ib_strerror(innodb_err));
+                        _("Cannot DROP table %s. HailDB Error %d (%s)\n"),
+                        haildb_table_name.c_str(),
+                        haildb_err, ib_strerror(haildb_err));
 
     assert(rollback_err == DB_SUCCESS);
 
     return HA_ERR_GENERIC;
   }
 
-  innodb_err= ib_trx_commit(innodb_schema_transaction);
-  if (innodb_err != DB_SUCCESS)
+  haildb_err= ib_trx_commit(haildb_schema_transaction);
+  if (haildb_err != DB_SUCCESS)
   {
-    ib_err_t rollback_err= ib_trx_rollback(innodb_schema_transaction);
+    ib_err_t rollback_err= ib_trx_rollback(haildb_schema_transaction);
 
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_DELETE_FILE,
-                        _("Cannot DROP table %s. InnoDB Error %d (%s)\n"),
-                        innodb_table_name.c_str(),
-                        innodb_err, ib_strerror(innodb_err));
+                        _("Cannot DROP table %s. HailDB Error %d (%s)\n"),
+                        haildb_table_name.c_str(),
+                        haildb_err, ib_strerror(haildb_err));
 
     assert(rollback_err == DB_SUCCESS);
     return HA_ERR_GENERIC;
@@ -1374,20 +1374,20 @@
   const char *message;
   ib_ulint_t message_len;
   drizzled::message::Table table_message;
-  string from_innodb_table_name;
-  string to_innodb_table_name;
+  string from_haildb_table_name;
+  string to_haildb_table_name;
   const char *from;
   const char *to;
   string serialized_message;
   ib_col_meta_t col_meta;
 
-  TableIdentifier_to_innodb_name(from_identifier, &from_innodb_table_name);
-  TableIdentifier_to_innodb_name(to_identifier, &to_innodb_table_name);
-
-  from= from_innodb_table_name.c_str();
-  to= to_innodb_table_name.c_str();
-
-  err= ib_cursor_open_table(INNODB_TABLE_DEFINITIONS_TABLE, transaction, &cursor);
+  TableIdentifier_to_haildb_name(from_identifier, &from_haildb_table_name);
+  TableIdentifier_to_haildb_name(to_identifier, &to_haildb_table_name);
+
+  from= from_haildb_table_name.c_str();
+  to= to_haildb_table_name.c_str();
+
+  err= ib_cursor_open_table(HAILDB_TABLE_DEFINITIONS_TABLE, transaction, &cursor);
   if (err != DB_SUCCESS)
   {
     rollback_err= ib_trx_rollback(transaction);
@@ -1452,14 +1452,14 @@
   return err;
 }
 
-int EmbeddedInnoDBEngine::doRenameTable(drizzled::Session &session,
+int HailDBEngine::doRenameTable(drizzled::Session &session,
                                         const drizzled::TableIdentifier &from,
                                         const drizzled::TableIdentifier &to)
 {
-  ib_trx_t innodb_schema_transaction;
+  ib_trx_t haildb_schema_transaction;
   ib_err_t err;
-  string from_innodb_table_name;
-  string to_innodb_table_name;
+  string from_haildb_table_name;
+  string to_haildb_table_name;
 
   if (to.getType() == message::Table::TEMPORARY
       && from.getType() == message::Table::TEMPORARY)
@@ -1468,46 +1468,46 @@
     return 0;
   }
 
-  TableIdentifier_to_innodb_name(from, &from_innodb_table_name);
-  TableIdentifier_to_innodb_name(to, &to_innodb_table_name);
+  TableIdentifier_to_haildb_name(from, &from_haildb_table_name);
+  TableIdentifier_to_haildb_name(to, &to_haildb_table_name);
 
-  innodb_schema_transaction= ib_trx_begin(IB_TRX_REPEATABLE_READ);
-  err= ib_schema_lock_exclusive(innodb_schema_transaction);
+  haildb_schema_transaction= ib_trx_begin(IB_TRX_REPEATABLE_READ);
+  err= ib_schema_lock_exclusive(haildb_schema_transaction);
   if (err != DB_SUCCESS)
   {
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_DELETE_FILE,
-                        _("Cannot Lock Embedded InnoDB Data Dictionary. InnoDB Error %d (%s)\n"),
+                        _("Cannot Lock HailDB Data Dictionary. HailDB Error %d (%s)\n"),
                         err, ib_strerror(err));
 
     goto rollback;
   }
 
-  err= ib_table_rename(innodb_schema_transaction,
-                       from_innodb_table_name.c_str(),
-                       to_innodb_table_name.c_str());
-  if (err != DB_SUCCESS)
-    goto rollback;
-
-  err= rename_table_message(innodb_schema_transaction, from, to);
-
-  if (err != DB_SUCCESS)
-    goto rollback;
-
-  err= ib_trx_commit(innodb_schema_transaction);
+  err= ib_table_rename(haildb_schema_transaction,
+                       from_haildb_table_name.c_str(),
+                       to_haildb_table_name.c_str());
+  if (err != DB_SUCCESS)
+    goto rollback;
+
+  err= rename_table_message(haildb_schema_transaction, from, to);
+
+  if (err != DB_SUCCESS)
+    goto rollback;
+
+  err= ib_trx_commit(haildb_schema_transaction);
   if (err != DB_SUCCESS)
     goto rollback;
 
   return 0;
 rollback:
-  ib_err_t rollback_err= ib_schema_unlock(innodb_schema_transaction);
+  ib_err_t rollback_err= ib_schema_unlock(haildb_schema_transaction);
   assert(rollback_err == DB_SUCCESS);
-  rollback_err= ib_trx_rollback(innodb_schema_transaction);
+  rollback_err= ib_trx_rollback(haildb_schema_transaction);
   assert(rollback_err == DB_SUCCESS);
   return ib_err_t_to_drizzle_error(err);
 }
 
-void EmbeddedInnoDBEngine::getTableNamesInSchemaFromInnoDB(
+void HailDBEngine::getTableNamesInSchemaFromHailDB(
                                  const drizzled::SchemaIdentifier &schema,
                                  drizzled::plugin::TableNameList *set_of_names,
                                  drizzled::TableIdentifiers *identifiers)
@@ -1524,21 +1524,21 @@
   search_string.append("/");
 
   transaction = ib_trx_begin(IB_TRX_REPEATABLE_READ);
-  ib_err_t innodb_err= ib_schema_lock_exclusive(transaction);
-  assert(innodb_err == DB_SUCCESS); /* FIXME: doGetTableNames needs to be able to return error */
+  ib_err_t haildb_err= ib_schema_lock_exclusive(transaction);
+  assert(haildb_err == DB_SUCCESS); /* FIXME: doGetTableNames needs to be able to return error */
 
   if (search_string.compare("data_dictionary/") == 0)
   {
     if (set_of_names)
     {
-      BOOST_FOREACH(std::string table_name, innodb_system_table_names)
+      BOOST_FOREACH(std::string table_name, haildb_system_table_names)
       {
         set_of_names->insert(table_name);
       }
     }
     if (identifiers)
     {
-      BOOST_FOREACH(std::string table_name, innodb_system_table_names)
+      BOOST_FOREACH(std::string table_name, haildb_system_table_names)
       {
         identifiers->push_back(TableIdentifier(schema.getSchemaName(),
                                                table_name));
@@ -1546,8 +1546,8 @@
     }
   }
 
-  innodb_err= ib_cursor_open_table("SYS_TABLES", transaction, &cursor);
-  assert(innodb_err == DB_SUCCESS); /* FIXME */
+  haildb_err= ib_cursor_open_table("SYS_TABLES", transaction, &cursor);
+  assert(haildb_err == DB_SUCCESS); /* FIXME */
 
   ib_tpl_t read_tuple;
   ib_tpl_t search_tuple;
@@ -1555,17 +1555,17 @@
   read_tuple= ib_clust_read_tuple_create(cursor);
   search_tuple= ib_clust_search_tuple_create(cursor);
 
-  innodb_err= ib_col_set_value(search_tuple, 0, search_string.c_str(),
+  haildb_err= ib_col_set_value(search_tuple, 0, search_string.c_str(),
                                search_string.length());
-  assert (innodb_err == DB_SUCCESS); // FIXME
+  assert (haildb_err == DB_SUCCESS); // FIXME
 
   int res;
-  innodb_err = ib_cursor_moveto(cursor, search_tuple, IB_CUR_GE, &res);
+  haildb_err = ib_cursor_moveto(cursor, search_tuple, IB_CUR_GE, &res);
   // fixme: check error above
 
-  while (innodb_err == DB_SUCCESS)
+  while (haildb_err == DB_SUCCESS)
   {
-    innodb_err= ib_cursor_read_row(cursor, read_tuple);
+    haildb_err= ib_cursor_read_row(cursor, read_tuple);
 
     const char *table_name;
     int table_name_len;
@@ -1587,28 +1587,28 @@
     }
 
 
-    innodb_err= ib_cursor_next(cursor);
+    haildb_err= ib_cursor_next(cursor);
     read_tuple= ib_tuple_clear(read_tuple);
   }
 
   ib_tuple_delete(read_tuple);
   ib_tuple_delete(search_tuple);
 
-  innodb_err= ib_cursor_close(cursor);
-  assert(innodb_err == DB_SUCCESS); // FIXME
+  haildb_err= ib_cursor_close(cursor);
+  assert(haildb_err == DB_SUCCESS); // FIXME
 
-  innodb_err= ib_trx_commit(transaction);
-  assert(innodb_err == DB_SUCCESS); // FIXME
+  haildb_err= ib_trx_commit(transaction);
+  assert(haildb_err == DB_SUCCESS); // FIXME
 }
 
-void EmbeddedInnoDBEngine::doGetTableIdentifiers(drizzled::CachedDirectory &,
+void HailDBEngine::doGetTableIdentifiers(drizzled::CachedDirectory &,
                                                  const drizzled::SchemaIdentifier &schema,
                                                  drizzled::TableIdentifiers &identifiers)
 {
-  getTableNamesInSchemaFromInnoDB(schema, NULL, &identifiers);
+  getTableNamesInSchemaFromHailDB(schema, NULL, &identifiers);
 }
 
-static int read_table_message_from_innodb(const char* table_name, drizzled::message::Table *table_message)
+static int read_table_message_from_haildb(const char* table_name, drizzled::message::Table *table_message)
 {
   ib_trx_t transaction;
   ib_tpl_t search_tuple;
@@ -1630,7 +1630,7 @@
     return err;
   }
 
-  err= ib_cursor_open_table(INNODB_TABLE_DEFINITIONS_TABLE, transaction, &cursor);
+  err= ib_cursor_open_table(HAILDB_TABLE_DEFINITIONS_TABLE, transaction, &cursor);
   if (err != DB_SUCCESS)
   {
     rollback_err= ib_trx_rollback(transaction);
@@ -1682,11 +1682,11 @@
   rollback_err= ib_trx_rollback(transaction);
   assert(rollback_err == DB_SUCCESS);
 
-  if (strcmp(table_name, INNODB_TABLE_DEFINITIONS_TABLE) == 0)
+  if (strcmp(table_name, HAILDB_TABLE_DEFINITIONS_TABLE) == 0)
   {
     message::Engine *engine= table_message->mutable_engine();
     engine->set_name("InnoDB");
-    table_message->set_name("innodb_table_definitions");
+    table_message->set_name("haildb_table_definitions");
     table_message->set_schema("data_dictionary");
     table_message->set_type(message::Table::STANDARD);
     table_message->set_creation_timestamp(0);
@@ -1727,62 +1727,62 @@
   return -1;
 }
 
-int EmbeddedInnoDBEngine::doGetTableDefinition(Session &session,
+int HailDBEngine::doGetTableDefinition(Session &session,
                                                const TableIdentifier &identifier,
                                                drizzled::message::Table &table)
 {
-  ib_crsr_t innodb_cursor= NULL;
-  string innodb_table_name;
+  ib_crsr_t haildb_cursor= NULL;
+  string haildb_table_name;
 
   /* Check temporary tables!? */
   if (session.getTableMessage(identifier, table))
     return EEXIST;
 
-  TableIdentifier_to_innodb_name(identifier, &innodb_table_name);
+  TableIdentifier_to_haildb_name(identifier, &haildb_table_name);
 
-  if (ib_cursor_open_table(innodb_table_name.c_str(), NULL, &innodb_cursor) != DB_SUCCESS)
+  if (ib_cursor_open_table(haildb_table_name.c_str(), NULL, &haildb_cursor) != DB_SUCCESS)
     return ENOENT;
 
-  ib_err_t err= ib_cursor_close(innodb_cursor);
+  ib_err_t err= ib_cursor_close(haildb_cursor);
 
   assert (err == DB_SUCCESS);
 
-  if (read_table_message_from_innodb(innodb_table_name.c_str(), &table) != 0)
+  if (read_table_message_from_haildb(haildb_table_name.c_str(), &table) != 0)
   {
-    if (get_innodb_system_table_message(innodb_table_name.c_str(), &table) == 0)
+    if (get_haildb_system_table_message(haildb_table_name.c_str(), &table) == 0)
       return EEXIST;
   }
 
   return EEXIST;
 }
 
-bool EmbeddedInnoDBEngine::doDoesTableExist(Session &,
-                                            const TableIdentifier& identifier)
+bool HailDBEngine::doDoesTableExist(Session &,
+                                    const TableIdentifier& identifier)
 {
-  ib_crsr_t innodb_cursor;
-  string innodb_table_name;
-
-  TableIdentifier_to_innodb_name(identifier, &innodb_table_name);
-
-  boost::unordered_set<string>::iterator iter= innodb_system_table_names.find(identifier.getTableName());
-  if (iter != innodb_system_table_names.end())
+  ib_crsr_t haildb_cursor;
+  string haildb_table_name;
+
+  TableIdentifier_to_haildb_name(identifier, &haildb_table_name);
+
+  boost::unordered_set<string>::iterator iter= haildb_system_table_names.find(identifier.getTableName());
+  if (iter != haildb_system_table_names.end())
     return true;
 
-  if (ib_cursor_open_table(innodb_table_name.c_str(), NULL, &innodb_cursor) != DB_SUCCESS)
+  if (ib_cursor_open_table(haildb_table_name.c_str(), NULL, &haildb_cursor) != DB_SUCCESS)
     return false;
 
-  ib_err_t err= ib_cursor_close(innodb_cursor);
+  ib_err_t err= ib_cursor_close(haildb_cursor);
   assert(err == DB_SUCCESS);
 
   return true;
 }
 
-const char *EmbeddedInnoDBCursor::index_type(uint32_t)
+const char *HailDBCursor::index_type(uint32_t)
 {
   return("BTREE");
 }
 
-static ib_err_t write_row_to_innodb_tuple(Field **fields, ib_tpl_t tuple)
+static ib_err_t write_row_to_haildb_tuple(Field **fields, ib_tpl_t tuple)
 {
   int colnr= 0;
   ib_err_t err= DB_ERROR;
@@ -1872,7 +1872,7 @@
   return(max_value);
 }
 
-int EmbeddedInnoDBCursor::doInsertRecord(unsigned char *record)
+int HailDBCursor::doInsertRecord(unsigned char *record)
 {
   ib_err_t err;
   int ret= 0;
@@ -1899,10 +1899,10 @@
      * yuck.
      */
 
-    EmbeddedInnoDBEngine *innodb_engine= static_cast<EmbeddedInnoDBEngine*>(engine);
+    HailDBEngine *storage_engine= static_cast<HailDBEngine*>(engine);
     err= ib_cursor_reset(cursor);
-    innodb_engine->doCommit(current_session, true);
-    innodb_engine->doStartTransaction(current_session, START_TRANS_NO_OPTIONS);
+    storage_engine->doCommit(current_session, true);
+    storage_engine->doStartTransaction(current_session, START_TRANS_NO_OPTIONS);
     transaction= *get_trx(table->in_use);
     assert(err == DB_SUCCESS);
     ib_cursor_attach_trx(cursor, transaction);
@@ -1940,7 +1940,7 @@
 
   }
 
-  write_row_to_innodb_tuple(table->getFields(), tuple);
+  write_row_to_haildb_tuple(table->getFields(), tuple);
 
   if (share->has_hidden_primary_key)
   {
@@ -1953,7 +1953,7 @@
   {
     if (write_can_replace)
     {
-      store_key_value_from_innodb(table->key_info + table->getShare()->getPrimaryKey(),
+      store_key_value_from_haildb(table->key_info + table->getShare()->getPrimaryKey(),
                                   ref, ref_length, record);
 
       ib_tpl_t search_tuple= ib_clust_search_tuple_create(cursor);
@@ -1973,7 +1973,7 @@
       err= ib_cursor_first(cursor);
       assert(err == DB_SUCCESS || err == DB_END_OF_INDEX);
 
-      write_row_to_innodb_tuple(table->getFields(), tuple);
+      write_row_to_haildb_tuple(table->getFields(), tuple);
 
       err= ib_cursor_insert_row(cursor, tuple);
       assert(err==DB_SUCCESS); // probably be nice and process errors
@@ -1991,7 +1991,7 @@
   return ret;
 }
 
-int EmbeddedInnoDBCursor::doUpdateRecord(const unsigned char *,
+int HailDBCursor::doUpdateRecord(const unsigned char *,
                                          unsigned char *)
 {
   ib_tpl_t update_tuple;
@@ -2002,7 +2002,7 @@
   err= ib_tuple_copy(update_tuple, tuple);
   assert(err == DB_SUCCESS);
 
-  write_row_to_innodb_tuple(table->getFields(), update_tuple);
+  write_row_to_haildb_tuple(table->getFields(), update_tuple);
 
   err= ib_cursor_update_row(cursor, tuple, update_tuple);
 
@@ -2018,7 +2018,7 @@
     return -1;
 }
 
-int EmbeddedInnoDBCursor::doDeleteRecord(const unsigned char *)
+int HailDBCursor::doDeleteRecord(const unsigned char *)
 {
   ib_err_t err;
 
@@ -2030,11 +2030,11 @@
   return 0;
 }
 
-int EmbeddedInnoDBCursor::delete_all_rows(void)
+int HailDBCursor::delete_all_rows(void)
 {
   /* I *think* ib_truncate is non-transactional....
      so only support TRUNCATE and not DELETE FROM t;
-     (this is what ha_innodb does)
+     (this is what ha_haildb does)
   */
   if (session_sql_command(table->in_use) != SQLCOM_TRUNCATE)
     return HA_ERR_WRONG_COMMAND;
@@ -2053,7 +2053,7 @@
 
     push_warning_printf(table->in_use, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
                         ER_CANT_DELETE_FILE,
-                        _("Cannot Lock Embedded InnoDB Data Dictionary. InnoDB Error %d (%s)\n"),
+                        _("Cannot Lock HailDB Data Dictionary. HailDB Error %d (%s)\n"),
                         err, ib_strerror(err));
 
     assert (rollback_err == DB_SUCCESS);
@@ -2083,7 +2083,7 @@
   return err;
 }
 
-int EmbeddedInnoDBCursor::doStartTableScan(bool)
+int HailDBCursor::doStartTableScan(bool)
 {
   ib_err_t err;
   ib_trx_t transaction;
@@ -2117,7 +2117,7 @@
   return(0);
 }
 
-int read_row_from_innodb(unsigned char* buf, ib_crsr_t cursor, ib_tpl_t tuple, Table* table, bool has_hidden_primary_key, uint64_t *hidden_pkey, drizzled::memory::Root **blobroot)
+int read_row_from_haildb(unsigned char* buf, ib_crsr_t cursor, ib_tpl_t tuple, Table* table, bool has_hidden_primary_key, uint64_t *hidden_pkey, drizzled::memory::Root **blobroot)
 {
   ib_err_t err;
   ptrdiff_t row_offset= buf - table->getInsertRecord();
@@ -2199,7 +2199,7 @@
   return 0;
 }
 
-int EmbeddedInnoDBCursor::rnd_next(unsigned char *buf)
+int HailDBCursor::rnd_next(unsigned char *buf)
 {
   ib_err_t err;
   int ret;
@@ -2211,7 +2211,7 @@
     err= ib_cursor_next(cursor);
 
   tuple= ib_tuple_clear(tuple);
-  ret= read_row_from_innodb(buf, cursor, tuple, table,
+  ret= read_row_from_haildb(buf, cursor, tuple, table,
                             share->has_hidden_primary_key,
                             &hidden_autoinc_pkey_position);
 
@@ -2219,7 +2219,7 @@
   return ret;
 }
 
-int EmbeddedInnoDBCursor::doEndTableScan()
+int HailDBCursor::doEndTableScan()
 {
   ib_err_t err;
 
@@ -2231,7 +2231,7 @@
   return 0;
 }
 
-int EmbeddedInnoDBCursor::rnd_pos(unsigned char *buf, unsigned char *pos)
+int HailDBCursor::rnd_pos(unsigned char *buf, unsigned char *pos)
 {
   ib_err_t err;
   int res;
@@ -2268,7 +2268,7 @@
   tuple= ib_tuple_clear(tuple);
 
   if (ret == 0)
-    ret= read_row_from_innodb(buf, cursor, tuple, table,
+    ret= read_row_from_haildb(buf, cursor, tuple, table,
                               share->has_hidden_primary_key,
                               &hidden_autoinc_pkey_position);
 
@@ -2277,7 +2277,7 @@
   return(ret);
 }
 
-static void store_key_value_from_innodb(KeyInfo *key_info, unsigned char* ref, int ref_len, const unsigned char *record)
+static void store_key_value_from_haildb(KeyInfo *key_info, unsigned char* ref, int ref_len, const unsigned char *record)
 {
   KeyPartInfo* key_part= key_info->key_part;
   KeyPartInfo* end= key_info->key_part + key_info->key_parts;
@@ -2332,7 +2332,7 @@
   assert(ref == ref_start + ref_len);
 }
 
-void EmbeddedInnoDBCursor::position(const unsigned char *record)
+void HailDBCursor::position(const unsigned char *record)
 {
   if (share->has_hidden_primary_key)
     *((uint64_t*) ref)= hidden_autoinc_pkey_position;
@@ -2344,19 +2344,19 @@
     else
       keynr= get_first_unique_index(*table);
 
-    store_key_value_from_innodb(table->key_info + keynr,
+    store_key_value_from_haildb(table->key_info + keynr,
                                 ref, ref_length, record);
   }
 
   return;
 }
 
-double EmbeddedInnoDBCursor::scan_time()
+double HailDBCursor::scan_time()
 {
   return 0.1;
 }
 
-int EmbeddedInnoDBCursor::info(uint32_t flag)
+int HailDBCursor::info(uint32_t flag)
 {
   stats.records= 2;
 
@@ -2365,7 +2365,7 @@
   return(0);
 }
 
-int EmbeddedInnoDBCursor::doStartIndexScan(uint32_t keynr, bool)
+int HailDBCursor::doStartIndexScan(uint32_t keynr, bool)
 {
   ib_trx_t transaction= *get_trx(table->in_use);
 
@@ -2381,7 +2381,7 @@
   {
     ib_err_t err;
     ib_id_t index_id;
-    err= ib_index_get_id(table_path_to_innodb_name(table_share->getPath()),
+    err= ib_index_get_id(table_path_to_haildb_name(table_share->getPath()),
                          table_share->getKeyInfo(keynr).name,
                          &index_id);
     if (err != DB_SUCCESS)
@@ -2509,7 +2509,7 @@
   assert(buff == key_ptr + key_len);
 }
 
-int EmbeddedInnoDBCursor::innodb_index_read(unsigned char *buf,
+int HailDBCursor::haildb_index_read(unsigned char *buf,
                                             const unsigned char *key_ptr,
                                             uint32_t key_len,
                                             drizzled::ha_rkey_function find_flag,
@@ -2547,7 +2547,7 @@
   }
 
   tuple= ib_tuple_clear(tuple);
-  ret= read_row_from_innodb(buf, cursor, tuple, table,
+  ret= read_row_from_haildb(buf, cursor, tuple, table,
                             share->has_hidden_primary_key,
                             &hidden_autoinc_pkey_position,
                             (allocate_blobs)? &blobroot : NULL);
@@ -2561,16 +2561,16 @@
   return ret;
 }
 
-int EmbeddedInnoDBCursor::index_read(unsigned char *buf,
+int HailDBCursor::index_read(unsigned char *buf,
                                      const unsigned char *key_ptr,
                                      uint32_t key_len,
                                      drizzled::ha_rkey_function find_flag)
 {
-  return innodb_index_read(buf, key_ptr, key_len, find_flag, false);
+  return haildb_index_read(buf, key_ptr, key_len, find_flag, false);
 }
 
 /* This is straight from cursor.cc, but it's private there :( */
-uint32_t EmbeddedInnoDBCursor::calculate_key_len(uint32_t key_position,
+uint32_t HailDBCursor::calculate_key_len(uint32_t key_position,
                                                  key_part_map keypart_map_arg)
 {
   /* works only with key prefixes */
@@ -2590,17 +2590,17 @@
 }
 
 
-int EmbeddedInnoDBCursor::innodb_index_read_map(unsigned char * buf,
+int HailDBCursor::haildb_index_read_map(unsigned char * buf,
                                                 const unsigned char *key,
                                                 key_part_map keypart_map,
                                                 enum ha_rkey_function find_flag,
                                                 bool allocate_blobs)
 {
   uint32_t key_len= calculate_key_len(active_index, keypart_map);
-  return  innodb_index_read(buf, key, key_len, find_flag, allocate_blobs);
+  return  haildb_index_read(buf, key, key_len, find_flag, allocate_blobs);
 }
 
-int EmbeddedInnoDBCursor::index_read_idx_map(unsigned char * buf,
+int HailDBCursor::index_read_idx_map(unsigned char * buf,
                                              uint32_t index,
                                              const unsigned char * key,
                                              key_part_map keypart_map,
@@ -2610,13 +2610,13 @@
   error= doStartIndexScan(index, 0);
   if (!error)
   {
-    error= innodb_index_read_map(buf, key, keypart_map, find_flag, true);
+    error= haildb_index_read_map(buf, key, keypart_map, find_flag, true);
     error1= doEndIndexScan();
   }
   return error ?  error : error1;
 }
 
-int EmbeddedInnoDBCursor::reset()
+int HailDBCursor::reset()
 {
   if (blobroot)
     blobroot->free_root(MYF(0));
@@ -2624,7 +2624,7 @@
   return 0;
 }
 
-int EmbeddedInnoDBCursor::index_next(unsigned char *buf)
+int HailDBCursor::index_next(unsigned char *buf)
 {
   int ret= HA_ERR_END_OF_FILE;
 
@@ -2636,7 +2636,7 @@
   }
 
   tuple= ib_tuple_clear(tuple);
-  ret= read_row_from_innodb(buf, cursor, tuple, table,
+  ret= read_row_from_haildb(buf, cursor, tuple, table,
                             share->has_hidden_primary_key,
                             &hidden_autoinc_pkey_position);
 
@@ -2644,14 +2644,14 @@
   return ret;
 }
 
-int EmbeddedInnoDBCursor::doEndIndexScan()
+int HailDBCursor::doEndIndexScan()
 {
   active_index= MAX_KEY;
 
   return doEndTableScan();
 }
 
-int EmbeddedInnoDBCursor::index_prev(unsigned char *buf)
+int HailDBCursor::index_prev(unsigned char *buf)
 {
   int ret= HA_ERR_END_OF_FILE;
   ib_err_t err;
@@ -2669,7 +2669,7 @@
   }
 
   tuple= ib_tuple_clear(tuple);
-  ret= read_row_from_innodb(buf, cursor, tuple, table,
+  ret= read_row_from_haildb(buf, cursor, tuple, table,
                             share->has_hidden_primary_key,
                             &hidden_autoinc_pkey_position);
 
@@ -2679,7 +2679,7 @@
 }
 
 
-int EmbeddedInnoDBCursor::index_first(unsigned char *buf)
+int HailDBCursor::index_first(unsigned char *buf)
 {
   int ret= HA_ERR_END_OF_FILE;
   ib_err_t err;
@@ -2689,7 +2689,7 @@
     return ib_err_t_to_drizzle_error(err);
 
   tuple= ib_tuple_clear(tuple);
-  ret= read_row_from_innodb(buf, cursor, tuple, table,
+  ret= read_row_from_haildb(buf, cursor, tuple, table,
                             share->has_hidden_primary_key,
                             &hidden_autoinc_pkey_position);
 
@@ -2699,7 +2699,7 @@
 }
 
 
-int EmbeddedInnoDBCursor::index_last(unsigned char *buf)
+int HailDBCursor::index_last(unsigned char *buf)
 {
   int ret= HA_ERR_END_OF_FILE;
   ib_err_t err;
@@ -2709,7 +2709,7 @@
     return ib_err_t_to_drizzle_error(err);
 
   tuple= ib_tuple_clear(tuple);
-  ret= read_row_from_innodb(buf, cursor, tuple, table,
+  ret= read_row_from_haildb(buf, cursor, tuple, table,
                             share->has_hidden_primary_key,
                             &hidden_autoinc_pkey_position);
   advance_cursor= true;
@@ -2717,7 +2717,7 @@
   return ret;
 }
 
-int EmbeddedInnoDBCursor::extra(enum ha_extra_function operation)
+int HailDBCursor::extra(enum ha_extra_function operation)
 {
   switch (operation)
   {
@@ -2751,7 +2751,7 @@
   if (create_db_err != IB_TRUE)
     return -1;
 
-  err= ib_table_schema_create(INNODB_TABLE_DEFINITIONS_TABLE, &schema,
+  err= ib_table_schema_create(HAILDB_TABLE_DEFINITIONS_TABLE, &schema,
                               IB_TBL_COMPACT, 0);
   if (err != DB_SUCCESS)
     return err;
@@ -2831,20 +2831,20 @@
 static long innobase_additional_mem_pool_size;
 static long innobase_force_recovery;
 static long innobase_log_buffer_size;
-static char  default_innodb_data_file_path[]= "ibdata1:10M:autoextend";
-static char* innodb_data_file_path= NULL;
-
-static int64_t innodb_log_file_size;
-static int64_t innodb_log_files_in_group;
-
-static int embedded_innodb_init(drizzled::module::Context &context)
+static char  default_haildb_data_file_path[]= "ibdata1:10M:autoextend";
+static char* haildb_data_file_path= NULL;
+
+static int64_t haildb_log_file_size;
+static int64_t haildb_log_files_in_group;
+
+static int haildb_init(drizzled::module::Context &context)
 {
-  innodb_system_table_names.insert(std::string("INNODB_SYS_TABLES"));
-  innodb_system_table_names.insert(std::string("INNODB_SYS_COLUMNS"));
-  innodb_system_table_names.insert(std::string("INNODB_SYS_INDEXES"));
-  innodb_system_table_names.insert(std::string("INNODB_SYS_FIELDS"));
-  innodb_system_table_names.insert(std::string("INNODB_SYS_FOREIGN"));
-  innodb_system_table_names.insert(std::string("INNODB_SYS_FOREIGN_COLS"));
+  haildb_system_table_names.insert(std::string("HAILDB_SYS_TABLES"));
+  haildb_system_table_names.insert(std::string("HAILDB_SYS_COLUMNS"));
+  haildb_system_table_names.insert(std::string("HAILDB_SYS_INDEXES"));
+  haildb_system_table_names.insert(std::string("HAILDB_SYS_FIELDS"));
+  haildb_system_table_names.insert(std::string("HAILDB_SYS_FOREIGN"));
+  haildb_system_table_names.insert(std::string("HAILDB_SYS_FOREIGN_COLS"));
 
   const module::option_map &vm= context.getOptions();
 
@@ -2926,18 +2926,18 @@
 
   if (vm.count("log-file-size"))
   {
-    if (innodb_log_file_size > INT64_MAX || innodb_log_file_size < 1*1024*1024L)
+    if (haildb_log_file_size > INT64_MAX || haildb_log_file_size < 1*1024*1024L)
     {
       errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of log-file-size"));
       exit(-1);
     }
-    innodb_log_file_size/= 1024*1024L;
-    innodb_log_file_size*= 1024*1024L;
+    haildb_log_file_size/= 1024*1024L;
+    haildb_log_file_size*= 1024*1024L;
   }
 
   if (vm.count("log-files-in-group"))
   {
-    if (innodb_log_files_in_group > 100 || innodb_log_files_in_group < 2)
+    if (haildb_log_files_in_group > 100 || haildb_log_files_in_group < 2)
     {
       errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of log-files-in-group"));
       exit(-1);
@@ -3049,31 +3049,31 @@
 
   if (vm.count("data-file-path"))
   {
-    innodb_data_file_path= const_cast<char *>(vm["data-file-path"].as<string>().c_str());
+    haildb_data_file_path= const_cast<char *>(vm["data-file-path"].as<string>().c_str());
   }
 
   ib_err_t err;
 
   err= ib_init();
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   if (innobase_data_home_dir)
   {
     err= ib_cfg_set_text("data_home_dir", innobase_data_home_dir);
     if (err != DB_SUCCESS)
-      goto innodb_error;
+      goto haildb_error;
   }
 
   if (innobase_log_group_home_dir)
   {
     err= ib_cfg_set_text("log_group_home_dir", innobase_log_group_home_dir);
     if (err != DB_SUCCESS)
-      goto innodb_error;
+      goto haildb_error;
   }
 
-  if (innodb_data_file_path == NULL)
-    innodb_data_file_path= default_innodb_data_file_path;
+  if (haildb_data_file_path == NULL)
+    haildb_data_file_path= default_haildb_data_file_path;
 
   if (innobase_print_verbose_log)
     err= ib_cfg_set_bool_on("print_verbose_log");
@@ -3081,7 +3081,7 @@
     err= ib_cfg_set_bool_off("print_verbose_log");
 
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   if (innobase_rollback_on_timeout)
     err= ib_cfg_set_bool_on("rollback_on_timeout");
@@ -3089,7 +3089,7 @@
     err= ib_cfg_set_bool_off("rollback_on_timeout");
 
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   if (innobase_use_doublewrite)
     err= ib_cfg_set_bool_on("doublewrite");
@@ -3097,7 +3097,7 @@
     err= ib_cfg_set_bool_off("doublewrite");
 
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   if (innobase_adaptive_hash_index)
     err= ib_cfg_set_bool_on("adaptive_hash_index");
@@ -3105,7 +3105,7 @@
     err= ib_cfg_set_bool_off("adaptive_hash_index");
 
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   if (srv_adaptive_flushing)
     err= ib_cfg_set_bool_on("adaptive_flushing");
@@ -3113,23 +3113,23 @@
     err= ib_cfg_set_bool_off("adaptive_flushing");
 
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("additional_mem_pool_size", innobase_additional_mem_pool_size);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("autoextend_increment", srv_auto_extend_increment);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("buffer_pool_size", innobase_buffer_pool_size);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("io_capacity", srv_io_capacity);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   if (srv_file_per_table)
     err= ib_cfg_set_bool_on("file_per_table");
@@ -3137,70 +3137,70 @@
     err= ib_cfg_set_bool_off("file_per_table");
 
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("flush_log_at_trx_commit", srv_flush_log_at_trx_commit);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   if (innobase_unix_file_flush_method)
   {
     err= ib_cfg_set_text("flush_method", innobase_unix_file_flush_method);
     if (err != DB_SUCCESS)
-      goto innodb_error;
+      goto haildb_error;
   }
 
   err= ib_cfg_set_int("force_recovery", innobase_force_recovery);
   if (err != DB_SUCCESS)
-    goto innodb_error;
-
-  err= ib_cfg_set_text("data_file_path", innodb_data_file_path);
-  if (err != DB_SUCCESS)
-    goto innodb_error;
-
-  err= ib_cfg_set_int("log_file_size", innodb_log_file_size);
-  if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
+
+  err= ib_cfg_set_text("data_file_path", haildb_data_file_path);
+  if (err != DB_SUCCESS)
+    goto haildb_error;
+
+  err= ib_cfg_set_int("log_file_size", haildb_log_file_size);
+  if (err != DB_SUCCESS)
+    goto haildb_error;
 
   err= ib_cfg_set_int("log_buffer_size", innobase_log_buffer_size);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
-  err= ib_cfg_set_int("log_files_in_group", innodb_log_files_in_group);
+  err= ib_cfg_set_int("log_files_in_group", haildb_log_files_in_group);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("checksums", innobase_use_checksums);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("lock_wait_timeout", innobase_lock_wait_timeout);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("max_dirty_pages_pct", srv_max_buf_pool_modified_pct);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("max_purge_lag", srv_max_purge_lag);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("open_files", innobase_open_files);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("read_io_threads", innobase_read_io_threads);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("write_io_threads", innobase_write_io_threads);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_cfg_set_int("sync_spin_loops", srv_n_spin_wait_rounds);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   if (srv_use_sys_malloc)
     err= ib_cfg_set_bool_on("use_sys_malloc");
@@ -3208,31 +3208,31 @@
     err= ib_cfg_set_bool_off("use_sys_malloc");
 
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   err= ib_startup(innobase_file_format_name);
   if (err != DB_SUCCESS)
-    goto innodb_error;
+    goto haildb_error;
 
   create_table_message_table();
 
-  embedded_innodb_engine= new EmbeddedInnoDBEngine("InnoDB");
-  context.add(embedded_innodb_engine);
+  haildb_engine= new HailDBEngine("InnoDB");
+  context.add(haildb_engine);
 
-  libinnodb_version_func_initialize(context);
-  libinnodb_datadict_dump_func_initialize(context);
+  haildb_version_func_initialize(context);
+  haildb_datadict_dump_func_initialize(context);
   config_table_function_initialize(context);
   status_table_function_initialize(context);
 
   return 0;
-innodb_error:
-  fprintf(stderr, _("Error starting Embedded InnoDB %d (%s)\n"),
+haildb_error:
+  fprintf(stderr, _("Error starting HailDB %d (%s)\n"),
           err, ib_strerror(err));
   return -1;
 }
 
 
-EmbeddedInnoDBEngine::~EmbeddedInnoDBEngine()
+HailDBEngine::~HailDBEngine()
 {
   ib_err_t err;
   ib_shutdown_t shutdown_flag= IB_SHUTDOWN_NORMAL;
@@ -3246,14 +3246,14 @@
 
   if (err != DB_SUCCESS)
   {
-    fprintf(stderr,"Error %d shutting down Embedded InnoDB!\n", err);
+    fprintf(stderr,"Error %d shutting down HailDB!\n", err);
   }
 
 }
 
-static char innodb_file_format_name_storage[100];
+static char haildb_file_format_name_storage[100];
 
-static int innodb_file_format_name_validate(Session*, drizzle_sys_var*,
+static int haildb_file_format_name_validate(Session*, drizzle_sys_var*,
                                             void *save,
                                             drizzle_value *value)
 {
@@ -3271,17 +3271,17 @@
 
   if (err == DB_SUCCESS)
   {
-    strncpy(innodb_file_format_name_storage, format, sizeof(innodb_file_format_name_storage));;
-    innodb_file_format_name_storage[sizeof(innodb_file_format_name_storage)-1]= 0;
+    strncpy(haildb_file_format_name_storage, format, sizeof(haildb_file_format_name_storage));;
+    haildb_file_format_name_storage[sizeof(haildb_file_format_name_storage)-1]= 0;
 
-    *static_cast<const char**>(save)= innodb_file_format_name_storage;
+    *static_cast<const char**>(save)= haildb_file_format_name_storage;
     return 0;
   }
   else
     return 1;
 }
 
-static void innodb_file_format_name_update(Session*, drizzle_sys_var*,
+static void haildb_file_format_name_update(Session*, drizzle_sys_var*,
                                            void *var_ptr,
                                            const void *save)
 
@@ -3294,13 +3294,13 @@
   format= *static_cast<const char*const*>(save);
 
   /* Format is already set in validate */
-  memmove(innodb_file_format_name_storage, format, sizeof(innodb_file_format_name_storage));;
-  innodb_file_format_name_storage[sizeof(innodb_file_format_name_storage)-1]= 0;
+  memmove(haildb_file_format_name_storage, format, sizeof(haildb_file_format_name_storage));;
+  haildb_file_format_name_storage[sizeof(haildb_file_format_name_storage)-1]= 0;
 
-  *static_cast<const char**>(var_ptr)= innodb_file_format_name_storage;
+  *static_cast<const char**>(var_ptr)= haildb_file_format_name_storage;
 }
 
-static void innodb_lru_old_blocks_pct_update(Session*, drizzle_sys_var*,
+static void haildb_lru_old_blocks_pct_update(Session*, drizzle_sys_var*,
                                              void *,
                                              const void *save)
 
@@ -3314,7 +3314,7 @@
     innobase_lru_old_blocks_pct= pct;
 }
 
-static void innodb_lru_block_access_recency_update(Session*, drizzle_sys_var*,
+static void haildb_lru_block_access_recency_update(Session*, drizzle_sys_var*,
                                                    void *,
                                                    const void *save)
 
@@ -3329,7 +3329,7 @@
     innobase_lru_block_access_recency= ms;
 }
 
-static void innodb_status_file_update(Session*, drizzle_sys_var*,
+static void haildb_status_file_update(Session*, drizzle_sys_var*,
                                       void *,
                                       const void *save)
 
@@ -3351,7 +3351,7 @@
 
 static DRIZZLE_SYSVAR_BOOL(adaptive_hash_index, innobase_adaptive_hash_index,
   PLUGIN_VAR_NOCMDARG,
-  "Enable InnoDB adaptive hash index (enabled by default).  ",
+  "Enable HailDB adaptive hash index (enabled by default).  ",
   NULL, NULL, true);
 
 static DRIZZLE_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing,
@@ -3361,7 +3361,7 @@
 
 static DRIZZLE_SYSVAR_LONG(additional_mem_pool_size, innobase_additional_mem_pool_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.",
+  "Size of a memory pool HailDB uses to store data dictionary information and other internal data structures.",
   NULL, NULL, 8*1024*1024L, 512*1024L, LONG_MAX, 1024);
 
 static DRIZZLE_SYSVAR_UINT(autoextend_increment, srv_auto_extend_increment,
@@ -3371,24 +3371,24 @@
 
 static DRIZZLE_SYSVAR_LONGLONG(buffer_pool_size, innobase_buffer_pool_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
+  "The size of the memory buffer HailDB uses to cache data and indexes of its tables.",
   NULL, NULL, 128*1024*1024L, 5*1024*1024L, INT64_MAX, 1024*1024L);
 
 static DRIZZLE_SYSVAR_BOOL(checksums, innobase_use_checksums,
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-  "Enable InnoDB checksums validation (enabled by default). "
-  "Disable with --skip-innodb-checksums.",
+  "Enable HailDB checksums validation (enabled by default). "
+  "Disable with --skip-haildb-checksums.",
   NULL, NULL, true);
 
 static DRIZZLE_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
   PLUGIN_VAR_READONLY,
-  "The common part for InnoDB table spaces.",
+  "The common part for HailDB table spaces.",
   NULL, NULL, NULL);
 
 static DRIZZLE_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-  "Enable InnoDB doublewrite buffer (enabled by default). "
-  "Disable with --skip-innodb-doublewrite.",
+  "Enable HailDB doublewrite buffer (enabled by default). "
+  "Disable with --skip-haildb-doublewrite.",
   NULL, NULL, true);
 
 static DRIZZLE_SYSVAR_ULONG(io_capacity, srv_io_capacity,
@@ -3398,7 +3398,7 @@
 
 static DRIZZLE_SYSVAR_ULONG(fast_shutdown, innobase_fast_shutdown,
   PLUGIN_VAR_OPCMDARG,
-  "Speeds up the shutdown process of the InnoDB storage engine. Possible "
+  "Speeds up the shutdown process of the HailDB storage engine. Possible "
   "values are 0, 1 (faster)"
   " or 2 (fastest - crash-like)"
   ".",
@@ -3406,14 +3406,14 @@
 
 static DRIZZLE_SYSVAR_BOOL(file_per_table, srv_file_per_table,
   PLUGIN_VAR_NOCMDARG,
-  "Stores each InnoDB table to an .ibd file in the database dir.",
+  "Stores each HailDB table to an .ibd file in the database dir.",
   NULL, NULL, false);
 
 static DRIZZLE_SYSVAR_STR(file_format, innobase_file_format_name,
   PLUGIN_VAR_RQCMDARG,
   "File format to use for new tables in .ibd files.",
-  innodb_file_format_name_validate,
-  innodb_file_format_name_update, "Barracuda");
+  haildb_file_format_name_validate,
+  haildb_file_format_name_update, "Barracuda");
 
 static DRIZZLE_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
   PLUGIN_VAR_OPCMDARG,
@@ -3431,33 +3431,33 @@
   "Helps to save your data in case the disk image of the database becomes corrupt.",
   NULL, NULL, 0, 0, 6, 0);
 
-static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,
+static DRIZZLE_SYSVAR_STR(data_file_path, haildb_data_file_path,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Path to individual files and their sizes.",
   NULL, NULL, NULL);
 
 static DRIZZLE_SYSVAR_STR(log_group_home_dir, innobase_log_group_home_dir,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "Path to InnoDB log files.", NULL, NULL, NULL);
+  "Path to HailDB log files.", NULL, NULL, NULL);
 
-static DRIZZLE_SYSVAR_LONGLONG(log_file_size, innodb_log_file_size,
+static DRIZZLE_SYSVAR_LONGLONG(log_file_size, haildb_log_file_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Size of each log file in a log group.",
   NULL, NULL, 20*1024*1024L, 1*1024*1024L, INT64_MAX, 1024*1024L);
 
-static DRIZZLE_SYSVAR_LONGLONG(log_files_in_group, innodb_log_files_in_group,
+static DRIZZLE_SYSVAR_LONGLONG(log_files_in_group, haildb_log_files_in_group,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "Number of log files in the log group. InnoDB writes to the files in a circular fashion. Value 3 is recommended here.",
+  "Number of log files in the log group. HailDB writes to the files in a circular fashion. Value 3 is recommended here.",
   NULL, NULL, 2, 2, 100, 0);
 
 static DRIZZLE_SYSVAR_ULONG(lock_wait_timeout, innobase_lock_wait_timeout,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
+  "Timeout in seconds an HailDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
   NULL, NULL, 5, 1, 1024 * 1024 * 1024, 0);
 
 static DRIZZLE_SYSVAR_LONG(log_buffer_size, innobase_log_buffer_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "The size of the buffer which InnoDB uses to write log to the log files on disk.",
+  "The size of the buffer which HailDB uses to write log to the log files on disk.",
   NULL, NULL, 8*1024*1024L, 256*1024L, LONG_MAX, 1024);
 
 static DRIZZLE_SYSVAR_ULONG(lru_old_blocks_pct, innobase_lru_old_blocks_pct,
@@ -3465,14 +3465,14 @@
   "Sets the point in the LRU list from where all pages are classified as "
   "old (Advanced users)",
   NULL,
-  innodb_lru_old_blocks_pct_update, 37, 5, 95, 0);
+  haildb_lru_old_blocks_pct_update, 37, 5, 95, 0);
 
 static DRIZZLE_SYSVAR_ULONG(lru_block_access_recency, innobase_lru_block_access_recency,
   PLUGIN_VAR_RQCMDARG,
   "Milliseconds between accesses to a block at which it is made young. "
   "0=disabled (Advanced users)",
   NULL,
-  innodb_lru_block_access_recency_update, 0, 0, ULONG_MAX, 0);
+  haildb_lru_block_access_recency_update, 0, 0, ULONG_MAX, 0);
 
 
 static DRIZZLE_SYSVAR_ULONG(max_dirty_pages_pct, srv_max_buf_pool_modified_pct,
@@ -3492,17 +3492,17 @@
 
 static DRIZZLE_SYSVAR_LONG(open_files, innobase_open_files,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "How many files at the maximum InnoDB keeps open at the same time.",
+  "How many files at the maximum HailDB keeps open at the same time.",
   NULL, NULL, 300L, 10L, LONG_MAX, 0);
 
 static DRIZZLE_SYSVAR_ULONG(read_io_threads, innobase_read_io_threads,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "Number of background read I/O threads in InnoDB.",
+  "Number of background read I/O threads in HailDB.",
   NULL, NULL, 4, 1, 64, 0);
 
 static DRIZZLE_SYSVAR_ULONG(write_io_threads, innobase_write_io_threads,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "Number of background write I/O threads in InnoDB.",
+  "Number of background write I/O threads in HailDB.",
   NULL, NULL, 4, 1, 64, 0);
 
 static DRIZZLE_SYSVAR_BOOL(print_verbose_log, innobase_print_verbose_log,
@@ -3512,50 +3512,50 @@
 
 static DRIZZLE_SYSVAR_BOOL(status_file, innobase_create_status_file,
   PLUGIN_VAR_OPCMDARG,
-  "Enable SHOW INNODB STATUS output in the log",
-  NULL, innodb_status_file_update, false);
+  "Enable SHOW HAILDB STATUS output in the log",
+  NULL, haildb_status_file_update, false);
 
 static DRIZZLE_SYSVAR_ULONG(sync_spin_loops, srv_n_spin_wait_rounds,
   PLUGIN_VAR_RQCMDARG,
-  "Count of spin-loop rounds in InnoDB mutexes (30 by default)",
+  "Count of spin-loop rounds in HailDB mutexes (30 by default)",
   NULL, NULL, 30L, 0L, ~0L, 0);
 
 static DRIZZLE_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-  "Use OS memory allocator instead of InnoDB's internal memory allocator",
+  "Use OS memory allocator instead of HailDB's internal memory allocator",
   NULL, NULL, true);
 
 static void init_options(drizzled::module::option_context &context)
 {
   context("disable-adaptive-hash-index",
-          N_("Disable InnoDB adaptive hash index (enabled by default)."));
+          N_("Disable HailDB adaptive hash index (enabled by default)."));
   context("disable-adaptive-flushing",
           N_("Do not attempt to flush dirty pages to avoid IO bursts at checkpoints."));
   context("additional-mem-pool-size",
           po::value<long>(&innobase_additional_mem_pool_size)->default_value(8*1024*1024L),
-          N_("Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures."));
+          N_("Size of a memory pool HailDB uses to store data dictionary information and other internal data structures."));
   context("autoextend-increment",
           po::value<unsigned int>(&srv_auto_extend_increment)->default_value(8L),
           N_("Data file autoextend increment in megabytes"));
   context("buffer-pool-size",
           po::value<int64_t>(&innobase_buffer_pool_size)->default_value(128*1024*1024L),
-          N_("The size of the memory buffer InnoDB uses to cache data and indexes of its tables."));
+          N_("The size of the memory buffer HailDB uses to cache data and indexes of its tables."));
   context("data-home-dir",
           po::value<string>(),
-          N_("The common part for InnoDB table spaces."));
+          N_("The common part for HailDB table spaces."));
   context("disable-checksums",
-          N_("Disable InnoDB checksums validation (enabled by default)."));
+          N_("Disable HailDB checksums validation (enabled by default)."));
   context("disable-doublewrite",
-          N_("Disable InnoDB doublewrite buffer (enabled by default)."));
+          N_("Disable HailDB doublewrite buffer (enabled by default)."));
   context("io-capacity",
           po::value<unsigned long>(&srv_io_capacity)->default_value(200),
           N_("Number of IOPs the server can do. Tunes the background IO rate"));
   context("fast-shutdown",
           po::value<unsigned long>(&innobase_fast_shutdown)->default_value(1),
-          N_("Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like)."));
+          N_("Speeds up the shutdown process of the HailDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like)."));
   context("file-per-table",
           po::value<bool>(&srv_file_per_table)->default_value(false)->zero_tokens(),
-          N_("Stores each InnoDB table to an .ibd file in the database dir."));
+          N_("Stores each HailDB table to an .ibd file in the database dir."));
   context("file-format",
           po::value<string>(),
           N_("File format to use for new tables in .ibd files."));
@@ -3576,19 +3576,19 @@
           N_("Path to individual files and their sizes."));
   context("log-group-home-dir",
           po::value<string>(),
-          N_("Path to InnoDB log files."));
+          N_("Path to HailDB log files."));
   context("log-file-size",
-          po::value<int64_t>(&innodb_log_file_size)->default_value(20*1024*1024L),
+          po::value<int64_t>(&haildb_log_file_size)->default_value(20*1024*1024L),
           N_("Size of each log file in a log group."));
-  context("innodb-log-files-in-group",
-          po::value<int64_t>(&innodb_log_files_in_group)->default_value(2),
-          N_("Number of log files in the log group. InnoDB writes to the files in a circular fashion. Value 3 is recommended here."));
+  context("haildb-log-files-in-group",
+          po::value<int64_t>(&haildb_log_files_in_group)->default_value(2),
+          N_("Number of log files in the log group. HailDB writes to the files in a circular fashion. Value 3 is recommended here."));
   context("lock-wait-timeout",
           po::value<unsigned long>(&innobase_lock_wait_timeout)->default_value(5),
-          N_("Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout."));
+          N_("Timeout in seconds an HailDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout."));
   context("log-buffer-size",
         po::value<long>(&innobase_log_buffer_size)->default_value(8*1024*1024L),
-        N_("The size of the buffer which InnoDB uses to write log to the log files on disk."));
+        N_("The size of the buffer which HailDB uses to write log to the log files on disk."));
   context("lru-old-blocks-pct",
           po::value<unsigned long>(&innobase_lru_old_blocks_pct)->default_value(37),
           N_("Sets the point in the LRU list from where all pages are classified as old (Advanced users)"));
@@ -3606,23 +3606,23 @@
           N_("Roll back the complete transaction on lock wait timeout, for 4.x compatibility (disabled by default)"));
   context("open-files",
           po::value<long>(&innobase_open_files)->default_value(300),
-          N_("How many files at the maximum InnoDB keeps open at the same time."));
+          N_("How many files at the maximum HailDB keeps open at the same time."));
   context("read-io-threads",
           po::value<unsigned long>(&innobase_read_io_threads)->default_value(4),
-          N_("Number of background read I/O threads in InnoDB."));
+          N_("Number of background read I/O threads in HailDB."));
   context("write-io-threads",
           po::value<unsigned long>(&innobase_write_io_threads)->default_value(4),
-          N_("Number of background write I/O threads in InnoDB."));
+          N_("Number of background write I/O threads in HailDB."));
   context("disable-print-verbose-log",
           N_("Disable if you want to reduce the number of messages written to the log (default: enabled)."));
   context("status-file",
           po::value<bool>(&innobase_create_status_file)->default_value(false)->zero_tokens(),
-          N_("Enable SHOW INNODB STATUS output in the log"));
+          N_("Enable SHOW HAILDB STATUS output in the log"));
   context("sync-spin-loops",
           po::value<unsigned long>(&srv_n_spin_wait_rounds)->default_value(30L),
-          N_("Count of spin-loop rounds in InnoDB mutexes (30 by default)"));
+          N_("Count of spin-loop rounds in HailDB mutexes (30 by default)"));
   context("use-internal-malloc",
-          N_("Use InnoDB's internal memory allocator instead of the OS memory allocator"));
+          N_("Use HailDB's internal memory allocator instead of the OS memory allocator"));
 }
 
 static drizzle_sys_var* innobase_system_variables[]= {
@@ -3668,9 +3668,9 @@
   "INNODB",
   "1.0",
   "Stewart Smith",
-  "Transactional Storage Engine using the Embedded InnoDB Library",
+  "Transactional Storage Engine using the HailDB Library",
   PLUGIN_LICENSE_GPL,
-  embedded_innodb_init,     /* Plugin Init */
+  haildb_init,     /* Plugin Init */
   innobase_system_variables, /* system variables */
   init_options                /* config options   */
 }

=== renamed file 'plugin/embedded_innodb/embedded_innodb_engine.h' => 'plugin/haildb/haildb_engine.h'
--- plugin/embedded_innodb/embedded_innodb_engine.h	2010-09-24 06:59:20 +0000
+++ plugin/haildb/haildb_engine.h	2010-09-30 08:13:47 +0000
@@ -16,16 +16,16 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef PLUGIN_EMBEDDED_INNODB_EMBEDDED_INNODB_ENGINE_H
-#define PLUGIN_EMBEDDED_INNODB_EMBEDDED_INNODB_ENGINE_H
+#ifndef PLUGIN_HAILDB_HAILDB_ENGINE_H
+#define PLUGIN_HAILDB_HAILDB_ENGINE_H
 
 #include <drizzled/cursor.h>
 #include <drizzled/atomics.h>
 
-class EmbeddedInnoDBTableShare
+class HailDBTableShare
 {
 public:
-  EmbeddedInnoDBTableShare(const char* name, bool hidden_primary_key);
+  HailDBTableShare(const char* name, bool hidden_primary_key);
 
   drizzled::THR_LOCK lock;
   int use_count;
@@ -36,11 +36,11 @@
   bool has_hidden_primary_key;
 };
 
-class EmbeddedInnoDBCursor: public drizzled::Cursor
+class HailDBCursor: public drizzled::Cursor
 {
 public:
-  EmbeddedInnoDBCursor(drizzled::plugin::StorageEngine &engine, drizzled::TableShare &table_arg);
-  ~EmbeddedInnoDBCursor()
+  HailDBCursor(drizzled::plugin::StorageEngine &engine, drizzled::TableShare &table_arg);
+  ~HailDBCursor()
   {}
 
   /*
@@ -62,7 +62,7 @@
   int index_read(unsigned char *buf, const unsigned char *key_ptr,
                  uint32_t key_len, drizzled::ha_rkey_function find_flag);
 
-  int innodb_index_read(unsigned char *buf,
+  int haildb_index_read(unsigned char *buf,
                         const unsigned char *key_ptr,
                         uint32_t key_len,
                         drizzled::ha_rkey_function find_flag,
@@ -70,7 +70,7 @@
 
   uint32_t calculate_key_len(uint32_t key_position,
                              drizzled::key_part_map keypart_map_arg);
-  int innodb_index_read_map(unsigned char * buf,
+  int haildb_index_read_map(unsigned char * buf,
                             const unsigned char *key,
                             drizzled::key_part_map keypart_map,
                             drizzled::ha_rkey_function find_flag,
@@ -94,12 +94,12 @@
   int doUpdateRecord(const unsigned char * old_data, unsigned char * new_data);
   int extra(drizzled::ha_extra_function operation);
 
-  EmbeddedInnoDBTableShare *get_share(const char *table_name,
-                                      bool has_hidden_primary_key,
-                                      int *rc);
+  HailDBTableShare *get_share(const char *table_name,
+                              bool has_hidden_primary_key,
+                              int *rc);
   int free_share();
 
-  EmbeddedInnoDBTableShare *share;
+  HailDBTableShare *share;
   drizzled::THR_LOCK_DATA lock;  /* lock for store_lock. this is ass. */
   drizzled::THR_LOCK_DATA **store_lock(drizzled::Session *,
                                        drizzled::THR_LOCK_DATA **to,
@@ -130,7 +130,6 @@
   bool in_table_scan;
 };
 
-int get_innodb_system_table_message(const char* table_name, drizzled::message::Table *table_message);
-
-
-#endif /* PLUGIN_EMBEDDED_INNODB_EMBEDDED_INNODB_ENGINE_H */
+int get_haildb_system_table_message(const char* table_name, drizzled::message::Table *table_message);
+
+#endif /* PLUGIN_HAILDB_HAILDB_ENGINE_H */

=== renamed file 'plugin/embedded_innodb/libinnodb_version_func.cc' => 'plugin/haildb/haildb_version_func.cc'
--- plugin/embedded_innodb/libinnodb_version_func.cc	2010-08-06 23:03:50 +0000
+++ plugin/haildb/haildb_version_func.cc	2010-09-30 08:13:47 +0000
@@ -21,7 +21,7 @@
 #include <drizzled/item/func.h>
 #include "drizzled/charset.h"
 #include <drizzled/function/str/strfunc.h>
-#include "libinnodb_version_func.h"
+#include "haildb_version_func.h"
 
 #if defined(HAVE_HAILDB_H)
 # include <haildb.h>
@@ -32,10 +32,10 @@
 using namespace std;
 using namespace drizzled;
 
-class LibinnodbVersionFunction : public Item_str_func
+class HailDBVersionFunction : public Item_str_func
 {
 public:
-  LibinnodbVersionFunction() : Item_str_func() {}
+  HailDBVersionFunction() : Item_str_func() {}
   String *val_str(String*);
 
   void fix_length_and_dec()
@@ -45,7 +45,7 @@
 
   const char *func_name() const
   {
-    return "libinnodb_version";
+    return "haildb_version";
   }
 
   bool check_argument_count(int n)
@@ -55,7 +55,7 @@
 };
 
 
-String *LibinnodbVersionFunction::val_str(String *str)
+String *HailDBVersionFunction::val_str(String *str)
 {
   assert(fixed == true);
 
@@ -81,11 +81,11 @@
 }
 
 
-plugin::Create_function<LibinnodbVersionFunction> *libinnodb_version_func= NULL;
+plugin::Create_function<HailDBVersionFunction> *haildb_version_func= NULL;
 
-int libinnodb_version_func_initialize(module::Context &context)
+int haildb_version_func_initialize(module::Context &context)
 {
-  libinnodb_version_func= new plugin::Create_function<LibinnodbVersionFunction>("libinnodb_version");
-  context.add(libinnodb_version_func);
+  haildb_version_func= new plugin::Create_function<HailDBVersionFunction>("haildb_version");
+  context.add(haildb_version_func);
   return 0;
 }

=== renamed file 'plugin/embedded_innodb/libinnodb_version_func.h' => 'plugin/haildb/haildb_version_func.h'
--- plugin/embedded_innodb/libinnodb_version_func.h	2010-05-18 18:20:56 +0000
+++ plugin/haildb/haildb_version_func.h	2010-09-30 08:13:47 +0000
@@ -16,9 +16,9 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef PLUGIN_EMBEDDED_INNODB_LIBINNODB_VERSION_FUNC_H
-#define PLUGIN_EMBEDDED_INNODB_LIBINNODB_VERSION_FUNC_H
-
-int libinnodb_version_func_initialize(drizzled::module::Context &context);
-
-#endif /* PLUGIN_EMBEDDED_INNODB_LIBINNODB_VERSION_FUNC_H */
+#ifndef PLUGIN_HAILDB_HAILDB_VERSION_FUNC_H
+#define PLUGIN_HAILDB_HAILDB_VERSION_FUNC_H
+
+int haildb_version_func_initialize(drizzled::module::Context &context);
+
+#endif /* PLUGIN_HAILDB_HAILDB_VERSION_FUNC_H */

=== modified file 'plugin/haildb/plugin.ini'
--- plugin/embedded_innodb/plugin.ini	2010-09-24 06:59:20 +0000
+++ plugin/haildb/plugin.ini	2010-09-30 08:13:47 +0000
@@ -1,8 +1,8 @@
 [plugin]
-title=InnoDB Storage Engine using the Embedded InnoDB library
-description=Work in progress engine using libinnodb instead of including it in tree.
-sources=embedded_innodb_engine.cc libinnodb_version_func.cc libinnodb_datadict_dump_func.cc config_table_function.cc status_table_function.cc datadict_table_message.cc
-headers=embedded_innodb_engine.h libinnodb_version_func.h libinnodb_datadict_dump_func.h config_table_function.h status_table_function.h
+title=HailDB storage engine
+description=Uses the HailDB library to implement a storage engine for Drizzle.
+sources=haildb_engine.cc haildb_version_func.cc haildb_datadict_dump_func.cc config_table_function.cc status_table_function.cc datadict_table_message.cc
+headers=haildb_engine.h haildb_version_func.h haildb_datadict_dump_func.h config_table_function.h status_table_function.h
 build_conditional="x${ac_cv_have_innodb}" = "xyes"
 ldflags=${INNODB_LIBS}
 extra_dist=test-suite-dir

=== modified file 'plugin/haildb/status_table_function.cc'
--- plugin/embedded_innodb/status_table_function.cc	2010-08-06 23:03:50 +0000
+++ plugin/haildb/status_table_function.cc	2010-09-30 08:13:47 +0000
@@ -111,7 +111,7 @@
 };
 
 LibInnoDBStatusTool::LibInnoDBStatusTool() :
-  plugin::TableFunction("DATA_DICTIONARY", "INNODB_STATUS")
+  plugin::TableFunction("DATA_DICTIONARY", "HAILDB_STATUS")
 {
   add_field("NAME");
   add_field("VALUE", plugin::TableFunction::NUMBER);

=== modified file 'plugin/haildb/status_table_function.h'
--- plugin/embedded_innodb/status_table_function.h	2010-05-18 18:20:56 +0000
+++ plugin/haildb/status_table_function.h	2010-09-30 08:13:47 +0000
@@ -16,9 +16,9 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef PLUGIN_EMBEDDED_INNODB_STATUS_TABLE_FUNCTION_H
-#define PLUGIN_EMBEDDED_INNODB_STATUS_TABLE_FUNCTION_H
+#ifndef PLUGIN_HAILDB_STATUS_TABLE_FUNCTION_H
+#define PLUGIN_HAILDB_STATUS_TABLE_FUNCTION_H
 
 int status_table_function_initialize(drizzled::module::Context &context);
 
-#endif /* PLUGIN_EMBEDDED_INNODB_STATUS_TABLE_FUNCTION_H */
+#endif /* PLUGIN_HAILDB_STATUS_TABLE_FUNCTION_H */

=== renamed directory 'plugin/embedded_innodb/test-suite-dir/embedded_innodb' => 'plugin/haildb/test-suite-dir/haildb'
=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/basic_innodb_table_proto_table.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_innodb_table_proto_table.result	2010-09-27 09:58:04 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/basic_innodb_table_proto_table.result	2010-09-30 08:13:47 +0000
@@ -1,30 +1,30 @@
-show create table data_dictionary.innodb_table_definitions;
+show create table data_dictionary.haildb_table_definitions;
 Table	Create Table
-innodb_table_definitions	CREATE TABLE `innodb_table_definitions` (
+haildb_table_definitions	CREATE TABLE `haildb_table_definitions` (
   `table_name` VARBINARY(192),
   `message` BLOB,
   PRIMARY KEY (`table_name`) USING BTREE
 ) ENGINE=InnoDB COLLATE = binary
-select * from data_dictionary.innodb_table_definitions;
+select * from data_dictionary.haildb_table_definitions;
 table_name	message
 use data_dictionary;
-show tables like 'innodb%';
-Tables_in_data_dictionary (innodb%)
-INNODB_CONFIGURATION
-INNODB_STATUS
-INNODB_SYS_COLUMNS
-INNODB_SYS_FIELDS
-INNODB_SYS_FOREIGN
-INNODB_SYS_FOREIGN_COLS
-INNODB_SYS_INDEXES
-INNODB_SYS_TABLES
-innodb_table_definitions
+show tables like 'haildb%';
+Tables_in_data_dictionary (haildb%)
+HAILDB_CONFIGURATION
+HAILDB_STATUS
+HAILDB_SYS_COLUMNS
+HAILDB_SYS_FIELDS
+HAILDB_SYS_FOREIGN
+HAILDB_SYS_FOREIGN_COLS
+HAILDB_SYS_INDEXES
+HAILDB_SYS_TABLES
+haildb_table_definitions
 use test;
 create table t1 (a int primary key);
-select table_name from data_dictionary.innodb_table_definitions;
+select table_name from data_dictionary.haildb_table_definitions;
 table_name
 test/t1
 drop table t1;
-select count(table_name) from data_dictionary.innodb_table_definitions;
+select count(table_name) from data_dictionary.haildb_table_definitions;
 count(table_name)
 0

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_flushing_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_adaptive_flushing_default.result	2010-05-10 13:17:59 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_flushing_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_flushing';
 Variable_name	Value
 innodb_adaptive_flushing	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_flushing';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_flushing';
 NAME	TYPE	VALUE
 adaptive_flushing	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_flushing_off.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_adaptive_flushing_off.result	2010-05-10 13:17:59 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_flushing_off.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_flushing';
 Variable_name	Value
 innodb_adaptive_flushing	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_flushing';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_flushing';
 NAME	TYPE	VALUE
 adaptive_flushing	BOOL	false

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_flushing_on.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_adaptive_flushing_on.result	2010-05-10 13:17:59 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_flushing_on.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_flushing';
 Variable_name	Value
 innodb_adaptive_flushing	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_flushing';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_flushing';
 NAME	TYPE	VALUE
 adaptive_flushing	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_hash_index_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_adaptive_hash_index_default.result	2010-05-10 12:53:25 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_hash_index_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_hash_index';
 Variable_name	Value
 innodb_adaptive_hash_index	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_hash_index';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_hash_index';
 NAME	TYPE	VALUE
 adaptive_hash_index	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_hash_index_off.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_adaptive_hash_index_off.result	2010-05-10 13:14:39 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_hash_index_off.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_hash_index';
 Variable_name	Value
 innodb_adaptive_hash_index	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_hash_index';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_hash_index';
 NAME	TYPE	VALUE
 adaptive_hash_index	BOOL	false

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_hash_index_on.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_adaptive_hash_index_on.result	2010-05-10 12:53:25 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_adaptive_hash_index_on.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_hash_index';
 Variable_name	Value
 innodb_adaptive_hash_index	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_hash_index';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_hash_index';
 NAME	TYPE	VALUE
 adaptive_hash_index	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_additional_mem_pool_size_32m.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_additional_mem_pool_size_32m.result	2010-05-10 13:27:43 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_additional_mem_pool_size_32m.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_additional_mem_pool_size';
 Variable_name	Value
 innodb_additional_mem_pool_size	33554432
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='additional_mem_pool_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='additional_mem_pool_size';
 NAME	TYPE	VALUE
 additional_mem_pool_size	ULINT	33554432

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_addtl_mem_pool_size_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_addtl_mem_pool_size_default.result	2010-07-08 21:21:35 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_addtl_mem_pool_size_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_additional_mem_pool_size';
 Variable_name	Value
 innodb_additional_mem_pool_size	8388608
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='additional_mem_pool_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='additional_mem_pool_size';
 NAME	TYPE	VALUE
 additional_mem_pool_size	ULINT	8388608

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_autoextend_increment_42.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_autoextend_increment_42.result	2010-05-10 13:56:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_autoextend_increment_42.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_autoextend_increment';
 Variable_name	Value
 innodb_autoextend_increment	42
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='autoextend_increment';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='autoextend_increment';
 NAME	TYPE	VALUE
 autoextend_increment	ULONG	42

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_autoextend_increment_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_autoextend_increment_default.result	2010-05-10 13:56:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_autoextend_increment_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_autoextend_increment';
 Variable_name	Value
 innodb_autoextend_increment	8
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='autoextend_increment';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='autoextend_increment';
 NAME	TYPE	VALUE
 autoextend_increment	ULONG	8

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_buffer_pool_size_22m.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_buffer_pool_size_22m.result	2010-05-10 14:02:46 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_buffer_pool_size_22m.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_buffer_pool_size';
 Variable_name	Value
 innodb_buffer_pool_size	20971520
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='buffer_pool_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='buffer_pool_size';
 NAME	TYPE	VALUE
 buffer_pool_size	ULINT	20971520

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_buffer_pool_size_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_buffer_pool_size_default.result	2010-05-10 14:02:46 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_buffer_pool_size_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_buffer_pool_size';
 Variable_name	Value
 innodb_buffer_pool_size	134217728
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='buffer_pool_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='buffer_pool_size';
 NAME	TYPE	VALUE
 buffer_pool_size	ULINT	134217728

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_checksums_disable.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_checksums_disable.result	2010-04-30 05:50:45 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_checksums_disable.result	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='checksums';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='checksums';
 NAME	TYPE	VALUE
 checksums	BOOL	false

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_checksums_enable.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_checksums_enable.result	2010-04-30 05:50:45 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_checksums_enable.result	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='checksums';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='checksums';
 NAME	TYPE	VALUE
 checksums	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_doublewrite_disable.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_disable.result	2010-05-03 13:21:19 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_doublewrite_disable.result	2010-09-30 08:13:47 +0000
@@ -1,4 +1,4 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='doublewrite';
 NAME	TYPE	VALUE
 doublewrite	BOOL	false
 SHOW VARIABLES LIKE 'innodb_doublewrite';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_doublewrite_enable.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_enable.result	2010-05-03 13:21:19 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_doublewrite_enable.result	2010-09-30 08:13:47 +0000
@@ -1,4 +1,4 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='doublewrite';
 NAME	TYPE	VALUE
 doublewrite	BOOL	true
 show variables like 'innodb_doublewrite';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_file_format.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_file_format.result	2010-05-05 02:33:31 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_file_format.result	2010-09-30 08:13:47 +0000
@@ -1,21 +1,21 @@
 SHOW VARIABLES LIKE 'innodb_file_format';
 Variable_name	Value
 innodb_file_format	Barracuda
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_format';
 NAME	TYPE	VALUE
 file_format	TEXT	Barracuda
 SET GLOBAL innodb_file_format='antelope';
 SHOW VARIABLES LIKE 'innodb_file_format';
 Variable_name	Value
 innodb_file_format	antelope
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_format';
 NAME	TYPE	VALUE
 file_format	TEXT	Antelope
 SET GLOBAL innodb_file_format='barracuda';
 SHOW VARIABLES LIKE 'innodb_file_format';
 Variable_name	Value
 innodb_file_format	barracuda
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_format';
 NAME	TYPE	VALUE
 file_format	TEXT	Barracuda
 SET GLOBAL innodb_file_format='broccolini';
@@ -23,6 +23,6 @@
 SHOW VARIABLES LIKE 'innodb_file_format';
 Variable_name	Value
 innodb_file_format	barracuda
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_format';
 NAME	TYPE	VALUE
 file_format	TEXT	Barracuda

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_file_per_table_disable.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_file_per_table_disable.result	2010-05-03 14:13:17 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_file_per_table_disable.result	2010-09-30 08:13:47 +0000
@@ -1,7 +1,7 @@
 SHOW VARIABLES LIKE 'innodb_file_per_table';
 Variable_name	Value
 innodb_file_per_table	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_per_table';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_per_table';
 NAME	TYPE	VALUE
 file_per_table	BOOL	false
 CREATE TABLE t1 (a int primary key);

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_file_per_table_enable.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_file_per_table_enable.result	2010-05-03 14:08:25 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_file_per_table_enable.result	2010-09-30 08:13:47 +0000
@@ -1,7 +1,7 @@
 SHOW VARIABLES LIKE 'innodb_file_per_table';
 Variable_name	Value
 innodb_file_per_table	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_per_table';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_per_table';
 NAME	TYPE	VALUE
 file_per_table	BOOL	true
 CREATE TABLE t1 (a int primary key);

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_log_at_trx_commit0.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result	2010-05-05 04:24:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_log_at_trx_commit0.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
 Variable_name	Value
 innodb_flush_log_at_trx_commit	0
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
 NAME	TYPE	VALUE
 flush_log_at_trx_commit	ULONG	0

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_log_at_trx_commit1.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result	2010-05-05 04:24:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_log_at_trx_commit1.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
 Variable_name	Value
 innodb_flush_log_at_trx_commit	1
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
 NAME	TYPE	VALUE
 flush_log_at_trx_commit	ULONG	1

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_log_at_trx_commit2.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result	2010-05-05 04:24:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_log_at_trx_commit2.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
 Variable_name	Value
 innodb_flush_log_at_trx_commit	2
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
 NAME	TYPE	VALUE
 flush_log_at_trx_commit	ULONG	2

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_method.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_method.result	2010-05-06 09:50:02 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_method.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_flush_method';
 Variable_name	Value
 innodb_flush_method	 
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_method';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_method';
 NAME	TYPE	VALUE
 flush_method	TEXT	fsync

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_method_fsync.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_method_fsync.result	2010-05-06 09:50:02 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_method_fsync.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_flush_method';
 Variable_name	Value
 innodb_flush_method	fsync
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_method';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_method';
 NAME	TYPE	VALUE
 flush_method	TEXT	fsync

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_method_odirect.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_method_odirect.result	2010-05-06 09:50:02 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_method_odirect.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_flush_method';
 Variable_name	Value
 innodb_flush_method	O_DIRECT
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_method';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_method';
 NAME	TYPE	VALUE
 flush_method	TEXT	O_DIRECT

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_method_odsync.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_method_odsync.result	2010-05-06 09:50:02 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_flush_method_odsync.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_flush_method';
 Variable_name	Value
 innodb_flush_method	O_DSYNC
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_method';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_method';
 NAME	TYPE	VALUE
 flush_method	TEXT	O_DSYNC

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_force_recovery.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_force_recovery.result	2010-05-11 05:11:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_force_recovery.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_force_recovery';
 Variable_name	Value
 innodb_force_recovery	1
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='force_recovery';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='force_recovery';
 NAME	TYPE	VALUE
 force_recovery	ULINT	1

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_io_capacity.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_io_capacity.result	2010-05-03 12:27:00 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_io_capacity.result	2010-09-30 08:13:47 +0000
@@ -1,4 +1,4 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='io_capacity';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='io_capacity';
 NAME	TYPE	VALUE
 io_capacity	ULONG	500
 show variables like 'innodb_io_capacity';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_lock_wait_timeout_1.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_lock_wait_timeout_1.result	2010-05-11 05:19:48 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_lock_wait_timeout_1.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_lock_wait_timeout';
 Variable_name	Value
 innodb_lock_wait_timeout	1
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lock_wait_timeout';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lock_wait_timeout';
 NAME	TYPE	VALUE
 lock_wait_timeout	ULINT	1

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_log_buffer_size_5m.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_log_buffer_size_5m.result	2010-05-11 05:36:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_log_buffer_size_5m.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_log_buffer_size';
 Variable_name	Value
 innodb_log_buffer_size	5242880
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='log_buffer_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='log_buffer_size';
 NAME	TYPE	VALUE
 log_buffer_size	ULINT	320

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_log_buffer_size_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_log_buffer_size_default.result	2010-05-11 05:36:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_log_buffer_size_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_log_buffer_size';
 Variable_name	Value
 innodb_log_buffer_size	8388608
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='log_buffer_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='log_buffer_size';
 NAME	TYPE	VALUE
 log_buffer_size	ULINT	512

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_log_group_home_dir.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_log_group_home_dir.result	2010-05-07 04:20:47 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_log_group_home_dir.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_log_group_home_dir';
 Variable_name	Value
 innodb_log_group_home_dir	 
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='log_group_home_dir';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='log_group_home_dir';
 NAME	TYPE	VALUE
 log_group_home_dir	TEXT	NULL

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_lru_block_access_recency.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_lru_block_access_recency.result	2010-05-07 13:05:14 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_lru_block_access_recency.result	2010-09-30 08:13:47 +0000
@@ -2,35 +2,35 @@
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
 Variable_name	Value
 innodb_lru_block_access_recency	0
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 NAME	TYPE	VALUE
 lru_block_access_recency	ULINT	0
 SET GLOBAL innodb_lru_block_access_recency=20;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
 Variable_name	Value
 innodb_lru_block_access_recency	20
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 NAME	TYPE	VALUE
 lru_block_access_recency	ULINT	20
 SET GLOBAL innodb_lru_block_access_recency=200;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
 Variable_name	Value
 innodb_lru_block_access_recency	200
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 NAME	TYPE	VALUE
 lru_block_access_recency	ULINT	200
 SET GLOBAL innodb_lru_block_access_recency=95;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
 Variable_name	Value
 innodb_lru_block_access_recency	95
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 NAME	TYPE	VALUE
 lru_block_access_recency	ULINT	95
 SET GLOBAL innodb_lru_block_access_recency=0;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
 Variable_name	Value
 innodb_lru_block_access_recency	0
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 NAME	TYPE	VALUE
 lru_block_access_recency	ULINT	0
 SET GLOBAL innodb_lru_block_access_recency=@my_lru;

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_lru_old_blocks_pct.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_lru_old_blocks_pct.result	2010-05-07 13:05:14 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_lru_old_blocks_pct.result	2010-09-30 08:13:47 +0000
@@ -2,14 +2,14 @@
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
 Variable_name	Value
 innodb_lru_old_blocks_pct	37
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 NAME	TYPE	VALUE
 lru_old_blocks_pct	ULINT	37
 SET GLOBAL innodb_lru_old_blocks_pct=20;
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
 Variable_name	Value
 innodb_lru_old_blocks_pct	20
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 NAME	TYPE	VALUE
 lru_old_blocks_pct	ULINT	20
 SET GLOBAL innodb_lru_old_blocks_pct=200;
@@ -18,21 +18,21 @@
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
 Variable_name	Value
 innodb_lru_old_blocks_pct	95
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 NAME	TYPE	VALUE
 lru_old_blocks_pct	ULINT	95
 SET GLOBAL innodb_lru_old_blocks_pct=95;
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
 Variable_name	Value
 innodb_lru_old_blocks_pct	95
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 NAME	TYPE	VALUE
 lru_old_blocks_pct	ULINT	95
 SET GLOBAL innodb_lru_old_blocks_pct=5;
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
 Variable_name	Value
 innodb_lru_old_blocks_pct	5
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 NAME	TYPE	VALUE
 lru_old_blocks_pct	ULINT	5
 SET GLOBAL innodb_lru_old_blocks_pct=@my_lru;

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_max_dirty_pages_pct.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_max_dirty_pages_pct.result	2010-05-07 08:02:05 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_max_dirty_pages_pct.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_max_dirty_pages_pct';
 Variable_name	Value
 innodb_max_dirty_pages_pct	75
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='max_dirty_pages_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='max_dirty_pages_pct';
 NAME	TYPE	VALUE
 max_dirty_pages_pct	ULONG	75

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_max_dirty_pages_pct_50.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_max_dirty_pages_pct_50.result	2010-05-07 08:02:05 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_max_dirty_pages_pct_50.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_max_dirty_pages_pct';
 Variable_name	Value
 innodb_max_dirty_pages_pct	50
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='max_dirty_pages_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='max_dirty_pages_pct';
 NAME	TYPE	VALUE
 max_dirty_pages_pct	ULONG	50

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_max_purge_lag.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_max_purge_lag.result	2010-05-07 12:15:41 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_max_purge_lag.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_max_purge_lag';
 Variable_name	Value
 innodb_max_purge_lag	0
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='max_purge_lag';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='max_purge_lag';
 NAME	TYPE	VALUE
 max_purge_lag	ULONG	0

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_max_purge_lag_42.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_max_purge_lag_42.result	2010-05-07 12:15:41 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_max_purge_lag_42.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_max_purge_lag';
 Variable_name	Value
 innodb_max_purge_lag	42
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='max_purge_lag';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='max_purge_lag';
 NAME	TYPE	VALUE
 max_purge_lag	ULONG	42

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_open_files_800.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_open_files_800.result	2010-05-10 05:13:41 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_open_files_800.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_open_files';
 Variable_name	Value
 innodb_open_files	800
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='open_files';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='open_files';
 NAME	TYPE	VALUE
 open_files	ULINT	800

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_open_files_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_open_files_default.result	2010-05-10 05:13:41 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_open_files_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_open_files';
 Variable_name	Value
 innodb_open_files	300
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='open_files';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='open_files';
 NAME	TYPE	VALUE
 open_files	ULINT	300

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_print_verbose_log.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_print_verbose_log.result	2010-05-11 05:46:17 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_print_verbose_log.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_print_verbose_log';
 Variable_name	Value
 innodb_print_verbose_log	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='print_verbose_log';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='print_verbose_log';
 NAME	TYPE	VALUE
 print_verbose_log	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_print_verbose_log_off.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_print_verbose_log_off.result	2010-05-11 05:46:17 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_print_verbose_log_off.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_print_verbose_log';
 Variable_name	Value
 innodb_print_verbose_log	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='print_verbose_log';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='print_verbose_log';
 NAME	TYPE	VALUE
 print_verbose_log	BOOL	false

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_print_verbose_log_on.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_print_verbose_log_on.result	2010-05-11 05:46:17 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_print_verbose_log_on.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_print_verbose_log';
 Variable_name	Value
 innodb_print_verbose_log	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='print_verbose_log';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='print_verbose_log';
 NAME	TYPE	VALUE
 print_verbose_log	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_read_io_threads_64.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_64.result	2010-05-10 06:06:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_read_io_threads_64.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_read_io_threads';
 Variable_name	Value
 innodb_read_io_threads	64
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='read_io_threads';
 NAME	TYPE	VALUE
 read_io_threads	ULINT	64

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_read_io_threads_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_read_io_threads_default.result	2010-05-10 06:06:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_read_io_threads_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_read_io_threads';
 Variable_name	Value
 innodb_read_io_threads	4
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='read_io_threads';
 NAME	TYPE	VALUE
 read_io_threads	ULINT	4

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_rollback_on_timeout.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_rollback_on_timeout.result	2010-05-11 07:09:35 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_rollback_on_timeout.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_rollback_on_timeout';
 Variable_name	Value
 innodb_rollback_on_timeout	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='rollback_on_timeout';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='rollback_on_timeout';
 NAME	TYPE	VALUE
 rollback_on_timeout	BOOL	false

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_rollback_on_timeout_off.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_rollback_on_timeout_off.result	2010-05-11 07:09:35 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_rollback_on_timeout_off.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_rollback_on_timeout';
 Variable_name	Value
 innodb_rollback_on_timeout	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='rollback_on_timeout';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='rollback_on_timeout';
 NAME	TYPE	VALUE
 rollback_on_timeout	BOOL	false

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_rollback_on_timeout_on.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_rollback_on_timeout_on.result	2010-05-11 07:09:35 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_rollback_on_timeout_on.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_rollback_on_timeout';
 Variable_name	Value
 innodb_rollback_on_timeout	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='rollback_on_timeout';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='rollback_on_timeout';
 NAME	TYPE	VALUE
 rollback_on_timeout	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_status_file.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_status_file.result	2010-05-11 07:19:05 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_status_file.result	2010-09-30 08:13:47 +0000
@@ -2,35 +2,35 @@
 SHOW VARIABLES LIKE 'innodb_status_file';
 Variable_name	Value
 innodb_status_file	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
-NAME	TYPE	VALUE
-status_file	BOOL	false
-SET GLOBAL innodb_status_file=1;
-SHOW VARIABLES LIKE 'innodb_status_file';
-Variable_name	Value
-innodb_status_file	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
-NAME	TYPE	VALUE
-status_file	BOOL	true
-SET GLOBAL innodb_status_file=0;
-SHOW VARIABLES LIKE 'innodb_status_file';
-Variable_name	Value
-innodb_status_file	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
-NAME	TYPE	VALUE
-status_file	BOOL	false
-SET GLOBAL innodb_status_file=1;
-SHOW VARIABLES LIKE 'innodb_status_file';
-Variable_name	Value
-innodb_status_file	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
-NAME	TYPE	VALUE
-status_file	BOOL	true
-SET GLOBAL innodb_status_file=0;
-SHOW VARIABLES LIKE 'innodb_status_file';
-Variable_name	Value
-innodb_status_file	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
+NAME	TYPE	VALUE
+status_file	BOOL	false
+SET GLOBAL innodb_status_file=1;
+SHOW VARIABLES LIKE 'innodb_status_file';
+Variable_name	Value
+innodb_status_file	ON
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
+NAME	TYPE	VALUE
+status_file	BOOL	true
+SET GLOBAL innodb_status_file=0;
+SHOW VARIABLES LIKE 'innodb_status_file';
+Variable_name	Value
+innodb_status_file	OFF
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
+NAME	TYPE	VALUE
+status_file	BOOL	false
+SET GLOBAL innodb_status_file=1;
+SHOW VARIABLES LIKE 'innodb_status_file';
+Variable_name	Value
+innodb_status_file	ON
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
+NAME	TYPE	VALUE
+status_file	BOOL	true
+SET GLOBAL innodb_status_file=0;
+SHOW VARIABLES LIKE 'innodb_status_file';
+Variable_name	Value
+innodb_status_file	OFF
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
 NAME	TYPE	VALUE
 status_file	BOOL	false
 SET GLOBAL innodb_status_file=@my_statusfile;

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_sync_spin_loops.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_sync_spin_loops.result	2010-05-11 07:29:33 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_sync_spin_loops.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_sync_spin_loops';
 Variable_name	Value
 innodb_sync_spin_loops	30
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='sync_spin_loops';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='sync_spin_loops';
 NAME	TYPE	VALUE
 sync_spin_loops	ULONG	30

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_sync_spin_loops_100.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_sync_spin_loops_100.result	2010-05-11 07:29:33 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_sync_spin_loops_100.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_sync_spin_loops';
 Variable_name	Value
 innodb_sync_spin_loops	100
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='sync_spin_loops';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='sync_spin_loops';
 NAME	TYPE	VALUE
 sync_spin_loops	ULONG	100

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_table_function.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_table_function.result	2010-09-08 10:02:37 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_table_function.result	2010-09-30 08:13:47 +0000
@@ -1,14 +1,14 @@
-SHOW CREATE TABLE DATA_DICTIONARY.INNODB_CONFIGURATION;
+SHOW CREATE TABLE DATA_DICTIONARY.HAILDB_CONFIGURATION;
 Table	Create Table
-INNODB_CONFIGURATION	CREATE TABLE `INNODB_CONFIGURATION` (
+HAILDB_CONFIGURATION	CREATE TABLE `HAILDB_CONFIGURATION` (
   `NAME` VARCHAR(256) NOT NULL,
   `TYPE` VARCHAR(256) NOT NULL,
   `VALUE` VARCHAR(64) DEFAULT NULL
 ) ENGINE=FunctionEngine COLLATE = utf8_general_ci
-SELECT COUNT(*) FROM DATA_DICTIONARY.INNODB_CONFIGURATION;
+SELECT COUNT(*) FROM DATA_DICTIONARY.HAILDB_CONFIGURATION;
 COUNT(*)
 36
-SELECT NAME,TYPE FROM DATA_DICTIONARY.INNODB_CONFIGURATION;
+SELECT NAME,TYPE FROM DATA_DICTIONARY.HAILDB_CONFIGURATION;
 NAME	TYPE
 adaptive_hash_index	BOOL
 adaptive_flushing	BOOL
@@ -46,7 +46,7 @@
 sync_spin_loops	ULONG
 use_sys_malloc	BOOL
 version	TEXT
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION where NAME NOT IN ("VERSION");
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION where NAME NOT IN ("VERSION");
 NAME	TYPE	VALUE
 adaptive_hash_index	BOOL	true
 adaptive_flushing	BOOL	true
@@ -83,10 +83,10 @@
 status_file	BOOL	false
 sync_spin_loops	ULONG	30
 use_sys_malloc	BOOL	true
-SELECT NAME,VALUE FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME IN ("data_file_path", "data_home_dir");
+SELECT NAME,VALUE FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME IN ("data_file_path", "data_home_dir");
 NAME	VALUE
 data_file_path	NULL
 data_home_dir	./
-SELECT NAME,VALUE FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME = "file_per_table";
+SELECT NAME,VALUE FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME = "file_per_table";
 NAME	VALUE
 file_per_table	false

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_use_internal_malloc.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_use_internal_malloc.result	2010-09-15 16:42:53 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_use_internal_malloc.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_use_sys_malloc';
 Variable_name	Value
 innodb_use_sys_malloc	OFF
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='use_sys_malloc';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='use_sys_malloc';
 NAME	TYPE	VALUE
 use_sys_malloc	BOOL	false

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_use_sys_malloc.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_use_sys_malloc.result	2010-05-11 07:29:33 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_use_sys_malloc.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_use_sys_malloc';
 Variable_name	Value
 innodb_use_sys_malloc	ON
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='use_sys_malloc';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='use_sys_malloc';
 NAME	TYPE	VALUE
 use_sys_malloc	BOOL	true

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_write_io_threads_64.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_64.result	2010-05-10 06:09:51 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_write_io_threads_64.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_write_io_threads';
 Variable_name	Value
 innodb_write_io_threads	64
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='write_io_threads';
 NAME	TYPE	VALUE
 write_io_threads	ULINT	64

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/config_write_io_threads_default.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result	2010-05-10 06:09:51 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/config_write_io_threads_default.result	2010-09-30 08:13:47 +0000
@@ -1,6 +1,6 @@
 SHOW VARIABLES LIKE 'innodb_write_io_threads';
 Variable_name	Value
 innodb_write_io_threads	4
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='write_io_threads';
 NAME	TYPE	VALUE
 write_io_threads	ULINT	4

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/datadict_tables.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/datadict_tables.result	2010-09-27 16:52:04 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/datadict_tables.result	2010-09-30 08:13:47 +0000
@@ -1,18 +1,18 @@
 USE data_dictionary;
-SHOW TABLES LIKE 'innodb%';
-Tables_in_data_dictionary (innodb%)
-INNODB_CONFIGURATION
-INNODB_STATUS
-INNODB_SYS_COLUMNS
-INNODB_SYS_FIELDS
-INNODB_SYS_FOREIGN
-INNODB_SYS_FOREIGN_COLS
-INNODB_SYS_INDEXES
-INNODB_SYS_TABLES
-innodb_table_definitions
-show create table data_dictionary.innodb_sys_tables;
+SHOW TABLES LIKE 'haildb%';
+Tables_in_data_dictionary (haildb%)
+HAILDB_CONFIGURATION
+HAILDB_STATUS
+HAILDB_SYS_COLUMNS
+HAILDB_SYS_FIELDS
+HAILDB_SYS_FOREIGN
+HAILDB_SYS_FOREIGN_COLS
+HAILDB_SYS_INDEXES
+HAILDB_SYS_TABLES
+haildb_table_definitions
+show create table data_dictionary.haildb_sys_tables;
 Table	Create Table
-innodb_sys_tables	CREATE TABLE `innodb_sys_tables` (
+haildb_sys_tables	CREATE TABLE `haildb_sys_tables` (
   `NAME` VARBINARY(192),
   `ID` BIGINT,
   `N_COLS` INT,
@@ -23,9 +23,9 @@
   `SPACE` INT,
   PRIMARY KEY (`NAME`) USING BTREE
 ) ENGINE=InnoDB COLLATE = binary
-show create table data_dictionary.innodb_sys_columns;
+show create table data_dictionary.haildb_sys_columns;
 Table	Create Table
-innodb_sys_columns	CREATE TABLE `innodb_sys_columns` (
+haildb_sys_columns	CREATE TABLE `haildb_sys_columns` (
   `TABLE_ID` BIGINT,
   `POS` INT,
   `NAME` VARBINARY(192),
@@ -35,9 +35,9 @@
   `PREC` INT,
   PRIMARY KEY (`TABLE_ID`,`POS`) USING BTREE
 ) ENGINE=InnoDB COLLATE = binary
-show create table data_dictionary.innodb_sys_indexes;
+show create table data_dictionary.haildb_sys_indexes;
 Table	Create Table
-innodb_sys_indexes	CREATE TABLE `innodb_sys_indexes` (
+haildb_sys_indexes	CREATE TABLE `haildb_sys_indexes` (
   `TABLE_ID` BIGINT,
   `ID` BIGINT,
   `NAME` VARBINARY(192),
@@ -47,17 +47,17 @@
   `PAGE_NO` INT,
   PRIMARY KEY (`TABLE_ID`,`ID`) USING BTREE
 ) ENGINE=InnoDB COLLATE = binary
-show create table data_dictionary.innodb_sys_fields;
+show create table data_dictionary.haildb_sys_fields;
 Table	Create Table
-innodb_sys_fields	CREATE TABLE `innodb_sys_fields` (
+haildb_sys_fields	CREATE TABLE `haildb_sys_fields` (
   `INDEX_ID` BIGINT,
   `POS` INT,
   `COL_NAME` VARBINARY(192),
   PRIMARY KEY (`INDEX_ID`,`POS`) USING BTREE
 ) ENGINE=InnoDB COLLATE = binary
-show create table data_dictionary.innodb_sys_foreign;
+show create table data_dictionary.haildb_sys_foreign;
 Table	Create Table
-innodb_sys_foreign	CREATE TABLE `innodb_sys_foreign` (
+haildb_sys_foreign	CREATE TABLE `haildb_sys_foreign` (
   `ID` BIGINT,
   `FOR_NAME` VARBINARY(192),
   `REF_NAME` VARBINARY(192),
@@ -66,27 +66,27 @@
   KEY `FOR_IND` (`FOR_NAME`) USING BTREE,
   KEY `REF_IND` (`REF_NAME`) USING BTREE
 ) ENGINE=InnoDB COLLATE = binary
-show create table data_dictionary.innodb_sys_foreign_cols;
+show create table data_dictionary.haildb_sys_foreign_cols;
 Table	Create Table
-innodb_sys_foreign_cols	CREATE TABLE `innodb_sys_foreign_cols` (
+haildb_sys_foreign_cols	CREATE TABLE `haildb_sys_foreign_cols` (
   `ID` BIGINT,
   `POS` INT,
   `FOR_COL_NAME` VARBINARY(192),
   `REF_COL_NAME` VARBINARY(192),
   PRIMARY KEY (`ID`,`POS`) USING BTREE
 ) ENGINE=InnoDB COLLATE = binary
-select name from data_dictionary.innodb_sys_tables;
+select name from data_dictionary.haildb_sys_tables;
 name
 SYS_FOREIGN
 SYS_FOREIGN_COLS
-data_dictionary/innodb_table_definitions
-explain select name from data_dictionary.innodb_sys_tables where name="SYS_FOREIGN";
+data_dictionary/haildb_table_definitions
+explain select name from data_dictionary.haildb_sys_tables where name="SYS_FOREIGN";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	innodb_sys_tables	const	PRIMARY	PRIMARY	195	const	1	Using index
-select name from data_dictionary.innodb_sys_tables where name="SYS_FOREIGN";
+1	SIMPLE	haildb_sys_tables	const	PRIMARY	PRIMARY	195	const	1	Using index
+select name from data_dictionary.haildb_sys_tables where name="SYS_FOREIGN";
 name
 SYS_FOREIGN
-select t.name t,c.name c from data_dictionary.innodb_sys_tables as t, data_dictionary.innodb_sys_columns as c where t.id=c.table_id;
+select t.name t,c.name c from data_dictionary.haildb_sys_tables as t, data_dictionary.haildb_sys_columns as c where t.id=c.table_id;
 t	c
 SYS_FOREIGN	ID
 SYS_FOREIGN	FOR_NAME
@@ -96,9 +96,9 @@
 SYS_FOREIGN_COLS	POS
 SYS_FOREIGN_COLS	FOR_COL_NAME
 SYS_FOREIGN_COLS	REF_COL_NAME
-data_dictionary/innodb_table_definitions	table_name
-data_dictionary/innodb_table_definitions	message
-select t.name as table_name,c.name as column_name from data_dictionary.innodb_sys_tables t,data_dictionary.innodb_sys_columns c where t.id=c.table_id order by table_name,column_name;
+data_dictionary/haildb_table_definitions	table_name
+data_dictionary/haildb_table_definitions	message
+select t.name as table_name,c.name as column_name from data_dictionary.haildb_sys_tables t,data_dictionary.haildb_sys_columns c where t.id=c.table_id order by table_name,column_name;
 table_name	column_name
 SYS_FOREIGN	FOR_NAME
 SYS_FOREIGN	ID
@@ -108,16 +108,16 @@
 SYS_FOREIGN_COLS	ID
 SYS_FOREIGN_COLS	POS
 SYS_FOREIGN_COLS	REF_COL_NAME
-data_dictionary/innodb_table_definitions	message
-data_dictionary/innodb_table_definitions	table_name
+data_dictionary/haildb_table_definitions	message
+data_dictionary/haildb_table_definitions	table_name
 create table test.t1 (a int primary key, b int, c int, index(b), index(c), index(b,c));
-select name,n_fields from data_dictionary.innodb_sys_indexes i where i.table_id=(select id from data_dictionary.innodb_sys_tables where name="test/t1");
+select name,n_fields from data_dictionary.haildb_sys_indexes i where i.table_id=(select id from data_dictionary.haildb_sys_tables where name="test/t1");
 name	n_fields
 PRIMARY	1
 b	1
 c	1
 b_2	2
-select f.col_name from data_dictionary.innodb_sys_fields f where f.index_id in (select id from data_dictionary.innodb_sys_indexes i where i.table_id=(select id from data_dictionary.innodb_sys_tables where name="test/t1"));
+select f.col_name from data_dictionary.haildb_sys_fields f where f.index_id in (select id from data_dictionary.haildb_sys_indexes i where i.table_id=(select id from data_dictionary.haildb_sys_tables where name="test/t1"));
 col_name
 a
 b

=== renamed file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/libinnodb_datadict_dump_func.result' => 'plugin/haildb/test-suite-dir/haildb/tests/r/haildb_datadict_dump_func.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/libinnodb_datadict_dump_func.result	2010-05-24 08:01:04 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/haildb_datadict_dump_func.result	2010-09-30 08:13:47 +0000
@@ -1,8 +1,8 @@
 CREATE table t1 (a int primary key);
 CREATE TABLE t2 (a int primary key, b varchar(30), c bigint);
-SELECT LIBINNODB_datadict_dump();
-LIBINNODB_datadict_dump()
-InnoDB Data Dictionary Contents
+SELECT haildb_datadict_dump();
+haildb_datadict_dump()
+HailDB Data Dictionary Contents
 -------------------------------
 SYS_FOREIGN Format: REDUNDANT Page size: 0 Columns: 7 Indexes: 3
   COL: ID
@@ -29,7 +29,7 @@
   IDX: ID_IND
     IDXCOL: ID
     IDXCOL: POS
-data_dictionary/innodb_table_definitions Format: COMPACT Page size: 0 Columns: 5 Indexes: 1
+data_dictionary/haildb_table_definitions Format: COMPACT Page size: 0 Columns: 5 Indexes: 1
   COL: table_name
   COL: message
   COL: DB_ROW_ID

=== renamed file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/libinnodb_version_func.result' => 'plugin/haildb/test-suite-dir/haildb/tests/r/haildb_version_func.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/libinnodb_version_func.result	2010-03-09 06:21:45 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/haildb_version_func.result	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
-SELECT LIBINNODB_VERSION();
-LIBINNODB_VERSION()
+SELECT HAILDB_VERSION();
+HAILDB_VERSION()
 Release 3, Revision 0, Age 0

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/row_format.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/row_format.result	2010-06-09 08:01:50 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/row_format.result	2010-09-30 08:13:47 +0000
@@ -2,16 +2,16 @@
 ERROR HY000: Can't create table 'test.t1' (errno: 138)
 SHOW WARNINGS;
 Level	Code	Message
-Error	1005	Cannot create table test/t1. InnoDB Error 48 (Unsupported)
+Error	1005	Cannot create table test/t1. HailDB Error 48 (Unsupported)
 
 Error	1005	Can't create table 'test.t1' (errno: 138)
 CREATE TABLE t2 (a int) ENGINE=INNODB ROW_FORMAT=COMPACT;
 CREATE TABLE t3 (a int) ENGINE=INNODB ROW_FORMAT=DYNAMIC;
 CREATE TABLE t4 (a int) ENGINE=INNODB ROW_FORMAT=REDUNDANT;
 CREATE TABLE t5 (a int) ENGINE=INNODB;
-SELECT LIBINNODB_datadict_dump();
-LIBINNODB_datadict_dump()
-InnoDB Data Dictionary Contents
+SELECT haildb_datadict_dump();
+haildb_datadict_dump()
+HailDB Data Dictionary Contents
 -------------------------------
 SYS_FOREIGN Format: REDUNDANT Page size: 0 Columns: 7 Indexes: 3
   COL: ID
@@ -38,7 +38,7 @@
   IDX: ID_IND
     IDXCOL: ID
     IDXCOL: POS
-data_dictionary/innodb_table_definitions Format: COMPACT Page size: 0 Columns: 5 Indexes: 1
+data_dictionary/haildb_table_definitions Format: COMPACT Page size: 0 Columns: 5 Indexes: 1
   COL: table_name
   COL: message
   COL: DB_ROW_ID

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/row_format_file_per_table.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/row_format_file_per_table.result	2010-06-07 08:46:37 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/row_format_file_per_table.result	2010-09-30 08:13:47 +0000
@@ -3,9 +3,9 @@
 CREATE TABLE t3 (a int) ENGINE=INNODB ROW_FORMAT=DYNAMIC;
 CREATE TABLE t4 (a int) ENGINE=INNODB ROW_FORMAT=REDUNDANT;
 CREATE TABLE t5 (a int) ENGINE=INNODB;
-SELECT LIBINNODB_datadict_dump();
-LIBINNODB_datadict_dump()
-InnoDB Data Dictionary Contents
+SELECT haildb_datadict_dump();
+haildb_datadict_dump()
+HailDB Data Dictionary Contents
 -------------------------------
 SYS_FOREIGN Format: REDUNDANT Page size: 0 Columns: 7 Indexes: 3
   COL: ID
@@ -32,7 +32,7 @@
   IDX: ID_IND
     IDXCOL: ID
     IDXCOL: POS
-data_dictionary/innodb_table_definitions Format: COMPACT Page size: 0 Columns: 5 Indexes: 1
+data_dictionary/haildb_table_definitions Format: COMPACT Page size: 0 Columns: 5 Indexes: 1
   COL: table_name
   COL: message
   COL: DB_ROW_ID

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/status_table_function.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/status_table_function.result	2010-09-08 10:02:37 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/status_table_function.result	2010-09-30 08:13:47 +0000
@@ -1,13 +1,13 @@
-SHOW CREATE TABLE DATA_DICTIONARY.INNODB_STATUS;
+SHOW CREATE TABLE DATA_DICTIONARY.haildb_STATUS;
 Table	Create Table
-INNODB_STATUS	CREATE TABLE `INNODB_STATUS` (
+haildb_STATUS	CREATE TABLE `HAILDB_STATUS` (
   `NAME` VARCHAR(256) NOT NULL,
   `VALUE` BIGINT DEFAULT NULL
 ) ENGINE=FunctionEngine COLLATE = utf8_general_ci
-SELECT COUNT(NAME) FROM DATA_DICTIONARY.INNODB_STATUS;
+SELECT COUNT(NAME) FROM DATA_DICTIONARY.haildb_STATUS;
 COUNT(NAME)
 41
-SELECT NAME FROM DATA_DICTIONARY.INNODB_STATUS;
+SELECT NAME FROM DATA_DICTIONARY.haildb_STATUS;
 NAME
 read_req_pending
 write_req_pending
@@ -50,26 +50,26 @@
 row_total_deleted
 page_size
 have_atomic_builtins
-SELECT * FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="page_size";
+SELECT * FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="page_size";
 NAME	VALUE
 page_size	16384
-SELECT (@fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 fsyncs
 #
 create table t1 (a int primary key);
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 fsyncs
 1
 insert into t1 values (1);
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 fsyncs
 1
 insert into t1 values (5),(2),(3),(4);
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 fsyncs
 1
 delete from t1;
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 fsyncs
 1
 begin;
@@ -78,10 +78,10 @@
 insert into t1 values (3);
 insert into t1 values (4);
 commit;
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 fsyncs
 1
 DROP TABLE t1;
-SELECT (@fsync_count < (@fsync_count:= VALUE)) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < (@fsync_count:= VALUE)) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 fsyncs
 1

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/r/type_blob_func.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob_func.result	2010-05-25 05:45:52 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/r/type_blob_func.result	2010-09-30 08:13:47 +0000
@@ -13,9 +13,9 @@
 3	1
 2	2
 1	3
-SELECT libinnodb_datadict_dump();
-libinnodb_datadict_dump()
-InnoDB Data Dictionary Contents
+SELECT haildb_datadict_dump();
+haildb_datadict_dump()
+HailDB Data Dictionary Contents
 -------------------------------
 SYS_FOREIGN Format: REDUNDANT Page size: 0 Columns: 7 Indexes: 3
   COL: ID
@@ -42,7 +42,7 @@
   IDX: ID_IND
     IDXCOL: ID
     IDXCOL: POS
-data_dictionary/innodb_table_definitions Format: COMPACT Page size: 0 Columns: 5 Indexes: 1
+data_dictionary/haildb_table_definitions Format: COMPACT Page size: 0 Columns: 5 Indexes: 1
   COL: table_name
   COL: message
   COL: DB_ROW_ID

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/basic_innodb_table_proto_table.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_table_proto_table.test	2010-03-02 22:45:29 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/basic_innodb_table_proto_table.test	2010-09-30 08:13:47 +0000
@@ -1,10 +1,10 @@
-show create table data_dictionary.innodb_table_definitions;
-select * from data_dictionary.innodb_table_definitions;
+show create table data_dictionary.haildb_table_definitions;
+select * from data_dictionary.haildb_table_definitions;
 use data_dictionary;
-show tables like 'innodb%';
+show tables like 'haildb%';
 use test;
 create table t1 (a int primary key);
-select table_name from data_dictionary.innodb_table_definitions;
+select table_name from data_dictionary.haildb_table_definitions;
 drop table t1;
-select count(table_name) from data_dictionary.innodb_table_definitions;
+select count(table_name) from data_dictionary.haildb_table_definitions;
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_flushing_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_default.test	2010-05-10 13:17:59 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_flushing_default.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_flushing';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_flushing';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_flushing';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_flushing_off.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off.test	2010-05-10 13:17:59 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_flushing_off.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_flushing';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_flushing';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_flushing';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_flushing_on.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on.test	2010-05-10 13:17:59 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_flushing_on.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_flushing';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_flushing';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_flushing';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_hash_index_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_default.test	2010-05-10 12:53:25 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_hash_index_default.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_hash_index';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_hash_index';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_hash_index';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_hash_index_off.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_off.test	2010-05-10 12:53:25 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_hash_index_off.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_hash_index';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_hash_index';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_hash_index';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_hash_index_on.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on.test	2010-05-10 12:53:25 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_adaptive_hash_index_on.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_adaptive_hash_index';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='adaptive_hash_index';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='adaptive_hash_index';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_additional_mem_pool_size_32m.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_32m.test	2010-05-10 13:27:43 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_additional_mem_pool_size_32m.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_additional_mem_pool_size';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='additional_mem_pool_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='additional_mem_pool_size';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_addtl_mem_pool_size_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default.test	2010-07-08 21:21:35 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_addtl_mem_pool_size_default.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_additional_mem_pool_size';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='additional_mem_pool_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='additional_mem_pool_size';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_autoextend_increment_42.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42.test	2010-05-10 13:56:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_autoextend_increment_42.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_autoextend_increment';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='autoextend_increment';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='autoextend_increment';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_autoextend_increment_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_default.test	2010-05-10 13:56:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_autoextend_increment_default.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_autoextend_increment';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='autoextend_increment';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='autoextend_increment';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_buffer_pool_size_22m.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m.test	2010-05-10 14:02:46 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_buffer_pool_size_22m.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_buffer_pool_size';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='buffer_pool_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='buffer_pool_size';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_buffer_pool_size_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_default.test	2010-05-10 14:02:46 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_buffer_pool_size_default.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_buffer_pool_size';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='buffer_pool_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='buffer_pool_size';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_checksums_disable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable.test	2010-04-30 05:50:45 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_checksums_disable.test	2010-09-30 08:13:47 +0000
@@ -1,1 +1,1 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='checksums';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='checksums';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_checksums_enable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable.test	2010-04-30 05:50:45 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_checksums_enable.test	2010-09-30 08:13:47 +0000
@@ -1,1 +1,1 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='checksums';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='checksums';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_doublewrite_disable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable.test	2010-05-03 13:21:19 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_doublewrite_disable.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='doublewrite';
 SHOW VARIABLES LIKE 'innodb_doublewrite';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_doublewrite_enable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable.test	2010-05-03 13:21:19 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_doublewrite_enable.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='doublewrite';
 show variables like 'innodb_doublewrite';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_file_format.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format.test	2010-08-26 21:56:15 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_file_format.test	2010-09-30 08:13:47 +0000
@@ -1,13 +1,13 @@
 SHOW VARIABLES LIKE 'innodb_file_format';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_format';
 SET GLOBAL innodb_file_format='antelope';
 SHOW VARIABLES LIKE 'innodb_file_format';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_format';
 SET GLOBAL innodb_file_format='barracuda';
 SHOW VARIABLES LIKE 'innodb_file_format';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_format';
 --error ER_WRONG_ARGUMENTS
 SET GLOBAL innodb_file_format='broccolini';
 SHOW VARIABLES LIKE 'innodb_file_format';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_format';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_file_per_table_disable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable.test	2010-05-03 14:13:17 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_file_per_table_disable.test	2010-09-30 08:13:47 +0000
@@ -1,5 +1,5 @@
 SHOW VARIABLES LIKE 'innodb_file_per_table';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_per_table';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_per_table';
 CREATE TABLE t1 (a int primary key);
 --error 1
 --file_exists $MYSQLTEST_VARDIR/master-data/test/t1.ibd

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_file_per_table_enable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable.test	2010-09-27 09:10:07 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_file_per_table_enable.test	2010-09-30 08:13:47 +0000
@@ -1,5 +1,5 @@
 SHOW VARIABLES LIKE 'innodb_file_per_table';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_per_table';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='file_per_table';
 CREATE TABLE t1 (a int primary key);
 --file_exists $MYSQLTEST_VARDIR/master-data/local/test/t1.ibd
 DROP TABLE t1; 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_log_at_trx_commit0.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0.test	2010-05-05 04:24:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_log_at_trx_commit0.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_log_at_trx_commit1.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1.test	2010-05-05 04:24:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_log_at_trx_commit1.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_log_at_trx_commit2.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2.test	2010-05-05 04:24:23 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_log_at_trx_commit2.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_method.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method.test	2010-05-06 09:50:02 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_method.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_flush_method';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_method';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_method';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_method_fsync.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync.test	2010-05-06 09:50:02 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_method_fsync.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_flush_method';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_method';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_method';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_method_odirect.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect.test	2010-05-06 09:50:02 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_method_odirect.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_flush_method';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_method';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_method';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_method_odsync.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync.test	2010-05-06 09:50:02 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_flush_method_odsync.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_flush_method';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_method';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='flush_method';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_force_recovery.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery.test	2010-05-11 05:11:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_force_recovery.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_force_recovery';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='force_recovery';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='force_recovery';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_io_capacity.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity.test	2010-05-03 12:27:00 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_io_capacity.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='io_capacity';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='io_capacity';
 show variables like 'innodb_io_capacity';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_lock_wait_timeout_1.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1.test	2010-05-11 05:19:48 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_lock_wait_timeout_1.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_lock_wait_timeout';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lock_wait_timeout';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lock_wait_timeout';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_log_buffer_size_5m.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m.test	2010-05-11 05:36:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_log_buffer_size_5m.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_log_buffer_size';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='log_buffer_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='log_buffer_size';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_log_buffer_size_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_default.test	2010-05-11 05:36:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_log_buffer_size_default.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_log_buffer_size';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='log_buffer_size';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='log_buffer_size';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_log_group_home_dir.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_group_home_dir.test	2010-05-07 04:20:47 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_log_group_home_dir.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_log_group_home_dir';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='log_group_home_dir';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='log_group_home_dir';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_lru_block_access_recency.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_block_access_recency.test	2010-05-07 13:05:14 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_lru_block_access_recency.test	2010-09-30 08:13:47 +0000
@@ -1,16 +1,16 @@
 SET @my_lru = @@global.innodb_lru_block_access_recency;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 SET GLOBAL innodb_lru_block_access_recency=20;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 SET GLOBAL innodb_lru_block_access_recency=200;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 SET GLOBAL innodb_lru_block_access_recency=95;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 SET GLOBAL innodb_lru_block_access_recency=0;
 SHOW VARIABLES LIKE 'innodb_lru_block_access_recency';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_block_access_recency';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_block_access_recency';
 SET GLOBAL innodb_lru_block_access_recency=@my_lru;

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_lru_old_blocks_pct.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_old_blocks_pct.test	2010-05-07 13:05:14 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_lru_old_blocks_pct.test	2010-09-30 08:13:47 +0000
@@ -1,16 +1,16 @@
 SET @my_lru = @@global.innodb_lru_old_blocks_pct;
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 SET GLOBAL innodb_lru_old_blocks_pct=20;
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 SET GLOBAL innodb_lru_old_blocks_pct=200;
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 SET GLOBAL innodb_lru_old_blocks_pct=95;
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 SET GLOBAL innodb_lru_old_blocks_pct=5;
 SHOW VARIABLES LIKE 'innodb_lru_old_blocks_pct';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='lru_old_blocks_pct';
 SET GLOBAL innodb_lru_old_blocks_pct=@my_lru;

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_max_dirty_pages_pct.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct.test	2010-05-07 08:02:05 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_max_dirty_pages_pct.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_max_dirty_pages_pct';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='max_dirty_pages_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='max_dirty_pages_pct';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_max_dirty_pages_pct_50.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50.test	2010-05-07 08:02:05 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_max_dirty_pages_pct_50.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_max_dirty_pages_pct';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='max_dirty_pages_pct';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='max_dirty_pages_pct';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_max_purge_lag.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag.test	2010-05-07 12:15:41 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_max_purge_lag.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_max_purge_lag';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='max_purge_lag';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='max_purge_lag';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_max_purge_lag_42.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42.test	2010-05-07 12:15:41 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_max_purge_lag_42.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_max_purge_lag';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='max_purge_lag';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='max_purge_lag';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_open_files_800.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800.test	2010-05-10 05:13:41 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_open_files_800.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_open_files';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='open_files';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='open_files';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_open_files_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_default.test	2010-05-10 05:13:41 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_open_files_default.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_open_files';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='open_files';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='open_files';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_print_verbose_log.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log.test	2010-05-11 05:46:17 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_print_verbose_log.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_print_verbose_log';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='print_verbose_log';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='print_verbose_log';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_print_verbose_log_off.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off.test	2010-05-11 05:46:17 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_print_verbose_log_off.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_print_verbose_log';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='print_verbose_log';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='print_verbose_log';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_print_verbose_log_on.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on.test	2010-05-11 05:46:17 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_print_verbose_log_on.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_print_verbose_log';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='print_verbose_log';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='print_verbose_log';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_read_io_threads_64.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64.test	2010-05-10 06:06:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_read_io_threads_64.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_read_io_threads';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='read_io_threads';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_read_io_threads_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default.test	2010-05-10 06:06:20 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_read_io_threads_default.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_read_io_threads';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='read_io_threads';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='read_io_threads';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_rollback_on_timeout.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout.test	2010-05-11 07:09:35 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_rollback_on_timeout.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_rollback_on_timeout';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='rollback_on_timeout';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='rollback_on_timeout';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_rollback_on_timeout_off.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off.test	2010-05-11 07:09:35 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_rollback_on_timeout_off.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_rollback_on_timeout';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='rollback_on_timeout';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='rollback_on_timeout';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_rollback_on_timeout_on.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on.test	2010-05-11 07:09:35 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_rollback_on_timeout_on.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_rollback_on_timeout';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='rollback_on_timeout';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='rollback_on_timeout';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_status_file.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_status_file.test	2010-05-11 07:19:05 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_status_file.test	2010-09-30 08:13:47 +0000
@@ -1,16 +1,16 @@
 SET @my_statusfile = @@global.innodb_status_file;
 SHOW VARIABLES LIKE 'innodb_status_file';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
-SET GLOBAL innodb_status_file=1;
-SHOW VARIABLES LIKE 'innodb_status_file';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
-SET GLOBAL innodb_status_file=0;
-SHOW VARIABLES LIKE 'innodb_status_file';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
-SET GLOBAL innodb_status_file=1;
-SHOW VARIABLES LIKE 'innodb_status_file';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
-SET GLOBAL innodb_status_file=0;
-SHOW VARIABLES LIKE 'innodb_status_file';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='status_file';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
+SET GLOBAL innodb_status_file=1;
+SHOW VARIABLES LIKE 'innodb_status_file';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
+SET GLOBAL innodb_status_file=0;
+SHOW VARIABLES LIKE 'innodb_status_file';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
+SET GLOBAL innodb_status_file=1;
+SHOW VARIABLES LIKE 'innodb_status_file';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
+SET GLOBAL innodb_status_file=0;
+SHOW VARIABLES LIKE 'innodb_status_file';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='status_file';
 SET GLOBAL innodb_status_file=@my_statusfile;

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_sync_spin_loops.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops.test	2010-05-11 07:29:33 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_sync_spin_loops.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_sync_spin_loops';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='sync_spin_loops';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='sync_spin_loops';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_sync_spin_loops_100.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops_100.test	2010-05-11 07:29:33 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_sync_spin_loops_100.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_sync_spin_loops';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='sync_spin_loops';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='sync_spin_loops';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_table_function.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_table_function.test	2010-08-10 18:18:26 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_table_function.test	2010-09-30 08:13:47 +0000
@@ -1,7 +1,7 @@
-SHOW CREATE TABLE DATA_DICTIONARY.INNODB_CONFIGURATION;
-SELECT COUNT(*) FROM DATA_DICTIONARY.INNODB_CONFIGURATION;
-SELECT NAME,TYPE FROM DATA_DICTIONARY.INNODB_CONFIGURATION;
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION where NAME NOT IN ("VERSION");
-SELECT NAME,VALUE FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME IN ("data_file_path", "data_home_dir");
-SELECT NAME,VALUE FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME = "file_per_table";
+SHOW CREATE TABLE DATA_DICTIONARY.HAILDB_CONFIGURATION;
+SELECT COUNT(*) FROM DATA_DICTIONARY.HAILDB_CONFIGURATION;
+SELECT NAME,TYPE FROM DATA_DICTIONARY.HAILDB_CONFIGURATION;
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION where NAME NOT IN ("VERSION");
+SELECT NAME,VALUE FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME IN ("data_file_path", "data_home_dir");
+SELECT NAME,VALUE FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME = "file_per_table";
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_use_internal_malloc.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_internal_malloc.test	2010-09-15 16:42:53 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_use_internal_malloc.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_use_sys_malloc';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='use_sys_malloc';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='use_sys_malloc';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_use_sys_malloc.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc.test	2010-05-11 07:29:33 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_use_sys_malloc.test	2010-09-30 08:13:47 +0000
@@ -1,3 +1,3 @@
 SHOW VARIABLES LIKE 'innodb_use_sys_malloc';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='use_sys_malloc';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='use_sys_malloc';
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_write_io_threads_64.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64.test	2010-05-10 06:09:51 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_write_io_threads_64.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_write_io_threads';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='write_io_threads';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/config_write_io_threads_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default.test	2010-05-10 06:09:51 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/config_write_io_threads_default.test	2010-09-30 08:13:47 +0000
@@ -1,2 +1,2 @@
 SHOW VARIABLES LIKE 'innodb_write_io_threads';
-SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='write_io_threads';
+SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='write_io_threads';

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/datadict_tables.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/datadict_tables.test	2010-09-27 16:34:45 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/datadict_tables.test	2010-09-30 08:13:47 +0000
@@ -1,19 +1,19 @@
 USE data_dictionary;
-SHOW TABLES LIKE 'innodb%';
-show create table data_dictionary.innodb_sys_tables;
-show create table data_dictionary.innodb_sys_columns;
-show create table data_dictionary.innodb_sys_indexes;
-show create table data_dictionary.innodb_sys_fields;
-show create table data_dictionary.innodb_sys_foreign;
-show create table data_dictionary.innodb_sys_foreign_cols;
-
-select name from data_dictionary.innodb_sys_tables;
-explain select name from data_dictionary.innodb_sys_tables where name="SYS_FOREIGN";
-select name from data_dictionary.innodb_sys_tables where name="SYS_FOREIGN";
-select t.name t,c.name c from data_dictionary.innodb_sys_tables as t, data_dictionary.innodb_sys_columns as c where t.id=c.table_id;
-
-select t.name as table_name,c.name as column_name from data_dictionary.innodb_sys_tables t,data_dictionary.innodb_sys_columns c where t.id=c.table_id order by table_name,column_name;
+SHOW TABLES LIKE 'haildb%';
+show create table data_dictionary.haildb_sys_tables;
+show create table data_dictionary.haildb_sys_columns;
+show create table data_dictionary.haildb_sys_indexes;
+show create table data_dictionary.haildb_sys_fields;
+show create table data_dictionary.haildb_sys_foreign;
+show create table data_dictionary.haildb_sys_foreign_cols;
+
+select name from data_dictionary.haildb_sys_tables;
+explain select name from data_dictionary.haildb_sys_tables where name="SYS_FOREIGN";
+select name from data_dictionary.haildb_sys_tables where name="SYS_FOREIGN";
+select t.name t,c.name c from data_dictionary.haildb_sys_tables as t, data_dictionary.haildb_sys_columns as c where t.id=c.table_id;
+
+select t.name as table_name,c.name as column_name from data_dictionary.haildb_sys_tables t,data_dictionary.haildb_sys_columns c where t.id=c.table_id order by table_name,column_name;
 create table test.t1 (a int primary key, b int, c int, index(b), index(c), index(b,c));
-select name,n_fields from data_dictionary.innodb_sys_indexes i where i.table_id=(select id from data_dictionary.innodb_sys_tables where name="test/t1");
-select f.col_name from data_dictionary.innodb_sys_fields f where f.index_id in (select id from data_dictionary.innodb_sys_indexes i where i.table_id=(select id from data_dictionary.innodb_sys_tables where name="test/t1"));
+select name,n_fields from data_dictionary.haildb_sys_indexes i where i.table_id=(select id from data_dictionary.haildb_sys_tables where name="test/t1");
+select f.col_name from data_dictionary.haildb_sys_fields f where f.index_id in (select id from data_dictionary.haildb_sys_indexes i where i.table_id=(select id from data_dictionary.haildb_sys_tables where name="test/t1"));
 drop table test.t1;

=== renamed file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_datadict_dump_func.test' => 'plugin/haildb/test-suite-dir/haildb/tests/t/haildb_datadict_dump_func.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_datadict_dump_func.test	2010-04-06 06:52:59 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/haildb_datadict_dump_func.test	2010-09-30 08:13:47 +0000
@@ -1,4 +1,4 @@
 CREATE table t1 (a int primary key);
 CREATE TABLE t2 (a int primary key, b varchar(30), c bigint);
-SELECT LIBINNODB_datadict_dump();
+SELECT haildb_datadict_dump();
 DROP TABLE t1, t2;

=== renamed file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_version_func.test' => 'plugin/haildb/test-suite-dir/haildb/tests/t/haildb_version_func.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_version_func.test	2010-02-08 04:30:03 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/haildb_version_func.test	2010-09-30 08:13:47 +0000
@@ -1,1 +1,1 @@
-SELECT LIBINNODB_VERSION();
+SELECT HAILDB_VERSION();

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/master.opt	2010-09-16 00:29:34 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/master.opt	2010-09-30 08:13:47 +0000
@@ -1,1 +1,1 @@
---plugin-add=embedded_innodb --plugin-remove=innobase
+--plugin-add=haildb --plugin-remove=innobase

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/row_format.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format.test	2010-08-26 21:56:15 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/row_format.test	2010-09-30 08:13:47 +0000
@@ -6,6 +6,6 @@
 CREATE TABLE t3 (a int) ENGINE=INNODB ROW_FORMAT=DYNAMIC;
 CREATE TABLE t4 (a int) ENGINE=INNODB ROW_FORMAT=REDUNDANT;
 CREATE TABLE t5 (a int) ENGINE=INNODB;
-SELECT LIBINNODB_datadict_dump();
+SELECT haildb_datadict_dump();
 DROP TABLE t2, t3, t4, t5;
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/row_format_file_per_table.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table.test	2010-06-07 08:46:37 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/row_format_file_per_table.test	2010-09-30 08:13:47 +0000
@@ -3,6 +3,6 @@
 CREATE TABLE t3 (a int) ENGINE=INNODB ROW_FORMAT=DYNAMIC;
 CREATE TABLE t4 (a int) ENGINE=INNODB ROW_FORMAT=REDUNDANT;
 CREATE TABLE t5 (a int) ENGINE=INNODB;
-SELECT LIBINNODB_datadict_dump();
+SELECT haildb_datadict_dump();
 DROP TABLE t1, t2, t3, t4, t5;
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/status_table_function.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/status_table_function.test	2010-05-17 08:02:51 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/status_table_function.test	2010-09-30 08:13:47 +0000
@@ -1,24 +1,24 @@
-SHOW CREATE TABLE DATA_DICTIONARY.INNODB_STATUS;
-SELECT COUNT(NAME) FROM DATA_DICTIONARY.INNODB_STATUS;
-SELECT NAME FROM DATA_DICTIONARY.INNODB_STATUS;
-SELECT * FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="page_size";
+SHOW CREATE TABLE DATA_DICTIONARY.haildb_STATUS;
+SELECT COUNT(NAME) FROM DATA_DICTIONARY.haildb_STATUS;
+SELECT NAME FROM DATA_DICTIONARY.haildb_STATUS;
+SELECT * FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="page_size";
 --replace_column 1 #
-SELECT (@fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 create table t1 (a int primary key);
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 insert into t1 values (1);
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 insert into t1 values (5),(2),(3),(4);
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 delete from t1;
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 begin;
 insert into t1 values (1);
 insert into t1 values (2);
 insert into t1 values (3);
 insert into t1 values (4);
 commit;
-SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < @fsync_count:= VALUE) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 DROP TABLE t1;
-SELECT (@fsync_count < (@fsync_count:= VALUE)) AS fsyncs FROM DATA_DICTIONARY.INNODB_STATUS WHERE NAME="fsync_req_done";
+SELECT (@fsync_count < (@fsync_count:= VALUE)) AS fsyncs FROM DATA_DICTIONARY.haildb_STATUS WHERE NAME="fsync_req_done";
 

=== modified file 'plugin/haildb/test-suite-dir/haildb/tests/t/type_blob_func.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_func.test	2010-05-25 05:45:52 +0000
+++ plugin/haildb/test-suite-dir/haildb/tests/t/type_blob_func.test	2010-09-30 08:13:47 +0000
@@ -6,7 +6,7 @@
 create table t1 (pk int auto_increment primary key, a blob);
 insert into t1 (a) values ('ccc'),('bb'),('a');
 select pk,length(a) from t1 order by length(a);
-SELECT libinnodb_datadict_dump();
+SELECT haildb_datadict_dump();
 drop table t1;
 
 create table t1 (a blob);

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-09-24 16:07:41 +0000
+++ po/POTFILES.in	2010-09-30 08:13:47 +0000
@@ -60,7 +60,7 @@
 plugin/default_replicator/default_replicator.cc
 plugin/drizzle_protocol/drizzle_protocol.cc
 plugin/drizzle_protocol/errmsg.cc
-plugin/embedded_innodb/embedded_innodb_engine.cc
+plugin/haildb/haildb_engine.cc
 plugin/errmsg_notify/errmsg_notify.cc
 plugin/errmsg_stderr/errmsg_stderr.cc
 plugin/filtered_replicator/filtered_replicator.cc