Merge lp:~stewart/drizzle/tableshare-use-tableidentifier into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

This switches TableShare over to use an identifier instead of two strings (db and table_name).

This makes one change to some appearances of a couple of data_dictionary tables. Odds are these were always incorrect (IIRC all I_S table names should be all UPPER_CASE anyway - because SQL loves to shout).

http://jenkins.drizzle.org/view/Drizzle-param/job/drizzle-param/914/

Unmerged revisions

2489. By Stewart Smith on 2012-01-04

merge table_identifier unittest fix

2488. By Stewart Smith on 2012-01-04

TableShare use a TableIdentifier instead of db,table strings.

2487. By Stewart Smith on 2012-01-04

merge print_transaction_message filename/path bug fix (also hit in testing CATALOG)

2486. By Stewart Smith on 2012-01-04

merge off-by-one error message fix (was hitting this)

2485. By Stewart Smith on 2011-12-28

Schema identifier has a Catalog identifier. Use it instead of catalog::local_identifier() in most places in Schema identifier code

2484. By Stewart Smith on 2011-12-28

update innodb-system-table-view.result to include CATALOG in path to table

2483. By Stewart Smith on 2011-12-28

modify tableprototester to include local/ in the path for the test tables

2482. By Stewart Smith on 2011-12-28

modify transaction_log plugin to default to local/transaction.log to keep backwards compatibility with old drizzled (before chdir to local/ was removed)

2481. By Stewart Smith on 2011-12-27

no longer chdir into local CATALOG. Instead, generate paths everywhere (well... in identifiers) that include the path to the correct CATALOG. Currently that's just LOCAL, but we get closer. Also added is some backwards compatibility code in InnoDB for old data dictionary entries that didn't include CATALOG in catalog/db/table but just had db/table. The next step is to construct the table and schema identifiers with the current CATALOG.

=== modified file 'drizzled/catalog/local.cc'
--- drizzled/catalog/local.cc	2011-09-18 17:33:22 +0000
+++ drizzled/catalog/local.cc	2012-01-05 00:31:36 +0000
@@ -1,7 +1,7 @@
 /* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  *
- *  Copyright (C) 2010 Brian Aker
+ *  Copyright (C) 2010-2011 Brian Aker, Stewart Smith
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -42,6 +42,14 @@
   return default_catalog;
 }
 
+void resetPath_for_local_identifier()
+{
+  /* this is currently commented out to do nothing as we don't need
+     to reset the relative path ../local to anything but that.
+     We will need to enable this when we don't chdir into local on startup */
+//  default_catalog.resetPath();
+}
+
 Instance::shared_ptr local()
 {
   boost::call_once(&init, run_once);
 
=== modified file 'drizzled/catalog/local.h'
--- drizzled/catalog/local.h	2011-03-23 23:34:24 +0000
+++ drizzled/catalog/local.h	2012-01-05 00:31:36 +0000
@@ -1,7 +1,7 @@
 /* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  *
- *  Copyright (C) 2010 Brian Aker
+ *  Copyright (C) 2010-2011 Brian Aker, Stewart Smith
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,6 +28,9 @@
 namespace drizzled {
 namespace catalog {
 
+/* only for use by drizzled after command line parsing (new datadir) */
+void resetPath_for_local_identifier();
+
 DRIZZLED_API const identifier::Catalog& local_identifier();
 DRIZZLED_API Instance::shared_ptr local();
 
 
=== modified file 'drizzled/data_home.cc'
--- drizzled/data_home.cc	2011-06-16 15:27:28 +0000
+++ drizzled/data_home.cc	2012-01-05 00:31:36 +0000
@@ -1,7 +1,7 @@
 /* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  *
- *  Copyright (C) 2011 Brian Aker
+ *  Copyright (C) 2011 Brian Aker, Stewart Smith
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,12 +22,12 @@
 #include <boost/filesystem.hpp>
 #include <drizzled/configmake.h>
 #include <drizzled/data_home.h>
+#include <drizzled/catalog.h>
 
 namespace drizzled {
 
 static boost::filesystem::path data_home(LOCALSTATEDIR);
 static boost::filesystem::path full_data_home(LOCALSTATEDIR);
-static boost::filesystem::path data_home_catalog(LOCALSTATEDIR);
 
 const boost::filesystem::path& getFullDataHome()
 {
@@ -39,11 +39,6 @@
   return data_home;
 }
 
-const boost::filesystem::path& getDataHomeCatalog()
-{
-  return data_home_catalog;
-}
-
 boost::filesystem::path& getMutableDataHome()
 {
   return data_home;
@@ -54,9 +49,4 @@
   full_data_home= v;
 }
 
-void setDataHomeCatalog(const boost::filesystem::path& v)
-{
-  data_home_catalog= v;
-}
-
 } // namespace drizzled
 
=== modified file 'drizzled/data_home.h'
--- drizzled/data_home.h	2011-06-16 15:27:28 +0000
+++ drizzled/data_home.h	2012-01-05 00:31:36 +0000
@@ -26,10 +26,8 @@
 
 DRIZZLED_API const boost::filesystem::path& getFullDataHome();
 DRIZZLED_API const boost::filesystem::path& getDataHome();
-DRIZZLED_API const boost::filesystem::path& getDataHomeCatalog();
 DRIZZLED_API boost::filesystem::path& getMutableDataHome();
 DRIZZLED_API void setFullDataHome(const boost::filesystem::path&);
-DRIZZLED_API void setDataHomeCatalog(const boost::filesystem::path&);
 
 } /* namespace drizzled */
 
 
=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2012-01-03 01:17:08 +0000
+++ drizzled/drizzled.cc	2012-01-05 00:31:36 +0000
@@ -1977,7 +1977,7 @@
 */
 static void get_options()
 {
-  setDataHomeCatalog(getDataHome() / "local");
+  catalog::resetPath_for_local_identifier();
 
   if (vm.count("user"))
   {
 
=== modified file 'drizzled/errmsg_print.cc'
--- drizzled/errmsg_print.cc	2011-10-20 02:45:57 +0000
+++ drizzled/errmsg_print.cc	2012-01-05 00:31:36 +0000
@@ -74,7 +74,7 @@
 
   if (not extra.empty())
   {
-    if (message.at(message.size()) != ' ')
+    if (message.at(message.size()-1) != ' ')
       message+= " ";
 
     message+= "'";
 
=== modified file 'drizzled/function/str/load_file.cc'
--- drizzled/function/str/load_file.cc	2011-06-22 22:23:29 +0000
+++ drizzled/function/str/load_file.cc	2012-01-05 00:31:36 +0000
@@ -2,6 +2,7 @@
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  *
  *  Copyright (C) 2008 Sun Microsystems, Inc.
+ *  Copyright (C) 2011 Stewart Smith
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@
 #include <drizzled/function/str/strfunc.h>
 #include <drizzled/function/str/load_file.h>
 #include <drizzled/error.h>
-#include <drizzled/data_home.h>
+#include <drizzled/catalog/local.h>
 #include <drizzled/session.h>
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/sys_var.h>
@@ -52,7 +53,7 @@
     return 0;
   }
 
-  fs::path target_path(fs::system_complete(getDataHomeCatalog()));
+  fs::path target_path(fs::system_complete(catalog::local_identifier().getPath()));
   fs::path to_file(file_name->c_ptr());
   if (not to_file.has_root_directory())
   {
 
=== modified file 'drizzled/identifier/catalog.cc'
--- drizzled/identifier/catalog.cc	2011-10-19 09:25:53 +0000
+++ drizzled/identifier/catalog.cc	2012-01-05 00:31:36 +0000
@@ -50,7 +50,7 @@
 void Catalog::init()
 { 
   assert(not _name.empty());
-  path += "../";
+  path.clear();
   path += util::tablename_to_filename(_name);
   assert(path.length()); // TODO throw exception, this is a possibility
   hash_value= util::insensitive_hash()(path);
 
=== modified file 'drizzled/identifier/catalog.h'
--- drizzled/identifier/catalog.h	2011-09-18 17:33:22 +0000
+++ drizzled/identifier/catalog.h	2012-01-05 00:31:36 +0000
@@ -35,7 +35,7 @@
 namespace drizzled {
 namespace identifier {
 
-class Catalog : public Identifier
+class DRIZZLED_API Catalog : public Identifier
 {
 public:
   Catalog(str_ref);
@@ -81,6 +81,12 @@
   {
     return boost::iequals(left.getName(), right.getName());
   }
+
+  void resetPath()
+  {
+    init();
+  }
+
 private:
   void init();
 
 
=== modified file 'drizzled/identifier/schema.cc'
--- drizzled/identifier/schema.cc	2011-10-19 09:25:53 +0000
+++ drizzled/identifier/schema.cc	2012-01-05 00:31:36 +0000
@@ -42,7 +42,8 @@
 namespace identifier {
 
 Schema::Schema(str_ref db_arg) :
-  db(db_arg.data(), db_arg.size())
+  db(db_arg.data(), db_arg.size()),
+  _catalog(drizzled::catalog::local_identifier())
 { 
 #if 0
   string::size_type lastPos= db.find_first_of('/', 0);
@@ -56,6 +57,8 @@
 
   if (not db_arg.empty())
   {
+    db_path += _catalog.getPath();
+    db_path += FN_LIBCHAR;
     db_path += util::tablename_to_filename(db);
     assert(db_path.length()); // TODO throw exception, this is a possibility
   }
@@ -95,12 +98,12 @@
 
 const std::string &Schema::getCatalogName() const
 {
-  return drizzled::catalog::local_identifier().name();
+  return _catalog.name();
 }
 
 std::ostream& operator<<(std::ostream& output, const Schema&identifier)
 {
-  return output << "identifier::Schema:(" <<  drizzled::catalog::local_identifier() << ", " <<  identifier.getSchemaName() << ", " << identifier.getPath() << ")";
+  return output << "identifier::Schema:(" <<  identifier.getCatalogName() << ", " <<  identifier.getSchemaName() << ", " << identifier.getPath() << ")";
 }
 
 } /* namespace identifier */
 
=== modified file 'drizzled/identifier/schema.h'
--- drizzled/identifier/schema.h	2011-10-18 13:52:19 +0000
+++ drizzled/identifier/schema.h	2012-01-05 00:31:36 +0000
@@ -37,10 +37,13 @@
 namespace drizzled {
 namespace identifier {
 
+class Catalog;
+
 class DRIZZLED_API Schema : public Identifier
 {
   std::string db;
   std::string db_path;
+  drizzled::identifier::Catalog _catalog;
 
 public:
   Schema(str_ref);
 
=== modified file 'drizzled/identifier/table.cc'
--- drizzled/identifier/table.cc	2011-10-19 09:25:53 +0000
+++ drizzled/identifier/table.cc	2012-01-05 00:31:36 +0000
@@ -33,6 +33,7 @@
 
 #include <drizzled/util/string.h>
 #include <drizzled/util/tablename_to_filename.h>
+#include <drizzled/catalog/local.h>
 
 #include <algorithm>
 #include <sstream>
@@ -179,7 +180,8 @@
 
 std::string Table::build_table_filename(const std::string &in_db, const std::string &in_table_name, bool is_tmp)
 {
-  string in_path= util::tablename_to_filename(in_db) + FN_LIBCHAR;
+  string in_path= drizzled::catalog::local_identifier().getPath();
+  in_path+= FN_LIBCHAR + util::tablename_to_filename(in_db) + FN_LIBCHAR;
   return in_path + (is_tmp ? in_table_name : util::tablename_to_filename(in_table_name));
 }
 
@@ -221,7 +223,7 @@
   }
 
   hash_value= util::insensitive_hash()(path);
-  key.set(getKeySize(), getSchemaName(), boost::to_lower_copy(std::string(getTableName())));
+  key.set(getKeySize(), getCatalogName(), getSchemaName(), boost::to_lower_copy(std::string(getTableName())));
 }
 
 
@@ -284,12 +286,14 @@
   message.set_schema(getSchemaName());
 }
 
-void Table::Key::set(size_t resize_arg, const std::string &a, const std::string &b)
+  void Table::Key::set(size_t resize_arg, const std::string &a, const std::string &b, const std::string &c)
 {
   key_buffer.resize(resize_arg);
 
   std::copy(a.begin(), a.end(), key_buffer.begin());
   std::copy(b.begin(), b.end(), key_buffer.begin() + a.length() + 1);
+  std::copy(c.begin(), c.end(),
+            key_buffer.begin() + a.length() + 1 + b.length() + 1);
 
   util::sensitive_hash hasher;
   hash_value= hasher(key_buffer);
 
=== modified file 'drizzled/identifier/table.h'
--- drizzled/identifier/table.h	2011-11-22 06:24:37 +0000
+++ drizzled/identifier/table.h	2012-01-05 00:31:36 +0000
@@ -81,7 +81,7 @@
       return key_buffer;
     }
 
-    void set(size_t resize_arg, const std::string &a, const std::string &b);
+    void set(size_t resize_arg, const std::string &a, const std::string &b, const std::string &c);
 
     friend bool operator==(const Key &left, const Key &right)
     {
@@ -123,7 +123,7 @@
 
   size_t getKeySize() const
   {
-    return getSchemaName().size() + getTableName().size() + 2;
+    return getCatalogName().size() + getSchemaName().size() + getTableName().size() + 3;
   }
 
 public:
 
=== modified file 'drizzled/main.cc'
--- drizzled/main.cc	2011-10-19 19:30:54 +0000
+++ drizzled/main.cc	2012-01-05 00:31:36 +0000
@@ -336,11 +336,6 @@
       }
     }
 
-    if (chdir("local") == -1)
-    {
-      unireg_abort << "Local catalog does not exist, was unable to chdir() to " << getDataHome().file_string();
-    }
-
     setFullDataHome(boost::filesystem::system_complete(getDataHome()));
     errmsg_printf(error::INFO, "Data Home directory is : %s", getFullDataHome().native_file_string().c_str());
   }
 
=== modified file 'drizzled/session.cc'
--- drizzled/session.cc	2011-11-09 20:20:23 +0000
+++ drizzled/session.cc	2012-01-05 00:31:36 +0000
@@ -27,7 +27,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/ptr_container/ptr_container.hpp>
 #include <drizzled/copy_field.h>
-#include <drizzled/data_home.h>
+#include <drizzled/catalog/local.h>
 #include <drizzled/diagnostics_area.h>
 #include <drizzled/display.h>
 #include <drizzled/drizzled.h>
@@ -996,7 +996,7 @@
 
   if (not to_file.has_root_directory())
   {
-    target_path= fs::system_complete(getDataHomeCatalog());
+    target_path= fs::system_complete(catalog::local_identifier().getPath());
     util::string::ptr schema(session.schema());
     if (not schema->empty())
     {
 
=== modified file 'drizzled/sql_load.cc'
--- drizzled/sql_load.cc	2011-10-18 11:01:40 +0000
+++ drizzled/sql_load.cc	2012-01-05 00:31:36 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2000-2006 MySQL AB
+   Copyright (C) 2011 Stewart Smith
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
 
 #include <drizzled/sql_load.h>
 #include <drizzled/error.h>
-#include <drizzled/data_home.h>
+#include <drizzled/catalog/local.h>
 #include <drizzled/session.h>
 #include <drizzled/sql_base.h>
 #include <drizzled/field/epoch.h>
@@ -263,7 +264,7 @@
   }
 
   fs::path to_file(ex->file_name);
-  fs::path target_path(fs::system_complete(getDataHomeCatalog()));
+  fs::path target_path(fs::system_complete(catalog::local_identifier().getPath()));
   if (not to_file.has_root_directory())
   {
     int count_elements= 0;
 
=== modified file 'drizzled/table/instance/base.cc'
--- drizzled/table/instance/base.cc	2011-10-29 18:07:51 +0000
+++ drizzled/table/instance/base.cc	2012-01-05 00:31:36 +0000
@@ -230,6 +230,7 @@
   key_info(NULL),
   mem_root(TABLE_ALLOC_BLOCK_SIZE),
   all_set(),
+  table_identifier(NULL),
   block_size(0),
   version(0),
   timestamp_offset(0),
@@ -289,6 +290,7 @@
   mem_root(TABLE_ALLOC_BLOCK_SIZE),
   table_charset(0),
   all_set(),
+  table_identifier(NULL),
   block_size(0),
   version(0),
   timestamp_offset(0),
@@ -328,6 +330,8 @@
   keys_in_use(0),
   keys_for_keyread(0)
 {
+  table_identifier= new identifier::Table(identifier);
+
   assert(identifier.getKey() == key);
 
   private_key_for_cache= key;
@@ -335,16 +339,8 @@
   table_category=         TABLE_CATEGORY_TEMPORARY;
   tmp_table=              message::Table::INTERNAL;
 
-  db= str_ref(private_key_for_cache.vector());
-
-  table_name= str_ref(private_key_for_cache.vector() + strlen(private_key_for_cache.vector()) + 1);
   path= str_ref("");
   normalized_path= str_ref("");
-
-  std::string tb_name(identifier.getTableName());
-  boost::to_lower(tb_name);
-  assert(strcmp(tb_name.c_str(), table_name.data()) == 0);
-  assert(strcmp(identifier.getSchemaName().c_str(), db.data()) == 0);
 }
 
 TableShare::TableShare(const identifier::Table &identifier) : // Just used during createTable()
@@ -355,6 +351,7 @@
   mem_root(TABLE_ALLOC_BLOCK_SIZE),
   table_charset(0),
   all_set(),
+  table_identifier(NULL),
   block_size(0),
   version(0),
   timestamp_offset(0),
@@ -394,6 +391,8 @@
   keys_in_use(0),
   keys_for_keyread(0)
 {
+  table_identifier= new identifier::Table(identifier);
+
   private_key_for_cache= identifier.getKey();
   assert(identifier.getPath().size()); // Since we are doing a create table, this should be a positive value
   private_normalized_path.resize(identifier.getPath().size() + 1);
@@ -402,8 +401,6 @@
   {
     table_category= TABLE_CATEGORY_TEMPORARY;
     tmp_table= message::Table::INTERNAL;
-    db= str_ref(private_key_for_cache.vector());
-    table_name= str_ref(db.data() + 1);
     path= private_normalized_path;
     normalized_path= path;
   }
@@ -424,6 +421,7 @@
   mem_root(TABLE_ALLOC_BLOCK_SIZE),
   table_charset(0),
   all_set(),
+  table_identifier(NULL),
   block_size(0),
   version(0),
   timestamp_offset(0),
@@ -463,14 +461,9 @@
   keys_in_use(0),
   keys_for_keyread(0)
 {
+  table_identifier= new identifier::Table(identifier);
 
   private_key_for_cache= identifier.getKey();
-  /*
-    Let us use the fact that the key is "db/0/table_name/0" + optional
-    part for temporary tables.
-  */
-  db= str_ref(private_key_for_cache.vector());
-  table_name= str_ref(db.data() + db.size() + 1);
 
   std::string _path;
   if (path_arg)
@@ -479,7 +472,7 @@
   }
   else
   {
-    _path= identifier::Table::build_table_filename(db.data(), table_name.data(), false);
+    _path= identifier::Table::build_table_filename(table_identifier->getSchemaName(), table_identifier->getTableName(), false);
   }
 
   char* path_buff= mem_root.strdup(_path);
@@ -493,8 +486,11 @@
 {
   table_category= TABLE_CATEGORY_TEMPORARY;
   tmp_table= message::Table::INTERNAL;
-  db= str_ref("");
-  table_name= str_ref(new_table_name);
+
+  identifier::Table *n= new identifier::Table("", new_table_name, new_path);
+  delete table_identifier;
+  table_identifier= n;
+
   path= str_ref(new_path);
   normalized_path= str_ref(new_path);
 }
@@ -502,6 +498,7 @@
 TableShare::~TableShare() 
 {
   storage_engine= NULL;
+  delete table_identifier;
 
   mem_root.free_root(MYF(0));                 // Free's share
 }
@@ -510,12 +507,8 @@
 {
   private_key_for_cache= identifier_arg.getKey();
 
-  /*
-    Let us use the fact that the key is "db/0/table_name/0" + optional
-    part for temporary tables.
-  */
-  db= str_ref(private_key_for_cache.vector());
-  table_name= str_ref(db.data() + db.size() + 1);
+  delete table_identifier;
+  table_identifier= new identifier::Table(identifier_arg);
 
   getTableMessage()->set_name(identifier_arg.getTableName());
   getTableMessage()->set_schema(identifier_arg.getSchemaName());
@@ -1708,8 +1701,7 @@
   case 1:
     if (db_errno == ENOENT)
     {
-      identifier::Table identifier(db.data(), table_name.data());
-      my_error(ER_TABLE_UNKNOWN, identifier);
+      my_error(ER_TABLE_UNKNOWN, *table_identifier);
     }
     else
     {
@@ -1732,7 +1724,7 @@
         snprintf(tmp, sizeof(tmp), "#%d", pass_errarg);
         csname= tmp;
       }
-      my_printf_error(ER_UNKNOWN_COLLATION, _("Unknown collation '%s' in table '%-.64s' definition"), MYF(0), csname, table_name.data());
+      my_printf_error(ER_UNKNOWN_COLLATION, _("Unknown collation '%s' in table '%-.64s' definition"), MYF(0), csname, table_identifier->getTableName().c_str());
       break;
     }
   case 6:
 
=== modified file 'drizzled/table/instance/base.h'
--- drizzled/table/instance/base.h	2011-10-29 18:07:51 +0000
+++ drizzled/table/instance/base.h	2012-01-05 00:31:36 +0000
@@ -231,8 +231,7 @@
 private:
   identifier::Table::Key private_key_for_cache; // This will not exist in the final design.
   std::vector<char> private_normalized_path; // This will not exist in the final design.
-  str_ref db;                        /* Pointer to db */
-  str_ref table_name;                /* Table name (for open) */
+  drizzled::identifier::Table *table_identifier;
   str_ref path;	/* Path to table (from datadir) */
   str_ref normalized_path;		/* unpack_filename(path) */
 
@@ -261,22 +260,22 @@
 
   str_ref getTableNameRef() const
   {
-    return table_name;
+    return str_ref(table_identifier->getTableName());
   }
 
   const char *getTableName() const
   {
-    return table_name.data();
+    return table_identifier->getTableName().c_str();
   }
 
   str_ref getSchemaNameRef() const
   {
-    return db;
+    return str_ref(table_identifier->getSchemaName());
   }
 
   const char *getSchemaName() const
   {
-    return db.data();
+    return table_identifier->getSchemaName().c_str();
   }
 
   uint32_t   block_size;                   /* create information */
 
=== modified file 'plugin/innobase/dict/dict0dict.cc'
--- plugin/innobase/dict/dict0dict.cc	2011-02-04 22:30:00 +0000
+++ plugin/innobase/dict/dict0dict.cc	2012-01-05 00:31:36 +0000
@@ -225,6 +225,11 @@
 	const char*	s = strchr(name, '/');
 	ut_a(s);
 
+        s= strchr(s+1, '/');
+
+        if (s == NULL)
+          s= strchr(name, '/');
+
 	return(s + 1);
 }
 
@@ -239,8 +244,14 @@
 				dbname '/' tablename */
 {
 	const char*	s;
-	s = strchr(name, '/');
-	ut_a(s);
+	const char*	catalog;
+	catalog = strchr(name, '/');
+	ut_a(catalog);
+        s= strchr(catalog+1, '/');
+
+        if (s == NULL)
+                s = catalog;
+
 	return(s - name);
 }
 
 
=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2011-11-09 20:20:23 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2012-01-05 00:31:36 +0000
@@ -3,6 +3,7 @@
 Copyright (C) 2000, 2010, MySQL AB & Innobase Oy. All Rights Reserved.
 Copyright (C) 2008, 2009 Google Inc.
 Copyright (C) 2009, Percona Inc.
+Copyright (C) 2011, Stewart Smith
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -50,6 +51,7 @@
 #include <drizzled/plugin.h>
 #include <drizzled/show.h>
 #include <drizzled/data_home.h>
+#include <drizzled/catalog/local.h>
 #include <drizzled/error.h>
 #include <drizzled/field.h>
 #include <drizzled/charset.h>
@@ -1795,6 +1797,12 @@
   const char* bufend  = buf + buflen;
 
   if (table_id) {
+    const char* catalog_skip= (const char*) memchr(id, '/', idlen);
+    if (catalog_skip)
+    {
+      idlen = idlen - (catalog_skip - id);
+      id = catalog_skip + 1;
+    }
     const char* slash = (const char*) memchr(id, '/', idlen);
     if (!slash) {
 
@@ -3514,6 +3522,15 @@
   else
   {
     ib_table = dict_table_get(identifier.getKeyPath().c_str(), TRUE);
+    if (ib_table == NULL
+        && drizzled::identifier::Catalog(identifier.getCatalogName())==drizzled::catalog::local_identifier())
+    {
+      std::string table_path_no_catalog(identifier.getKeyPath());
+      table_path_no_catalog.erase(0, drizzled::catalog::local_identifier().getPath().length()+1);
+      /* We try without local/ as old InnoDB data dictionary (pre CATALOG)
+         did not have local/ in data dict, just in filesystem path */
+      ib_table = dict_table_get(table_path_no_catalog.c_str(), TRUE);
+    }
   }
   
   if (NULL == ib_table) {
@@ -6661,6 +6678,16 @@
                                    session.getSqlCommand()
                                    == SQLCOM_DROP_DB);
 
+  if (error == ENOENT
+      && drizzled::identifier::Catalog(identifier.getCatalogName())==drizzled::catalog::local_identifier())
+  {
+    std::string table_path_no_catalog(identifier.getKeyPath());
+    table_path_no_catalog.erase(0, drizzled::catalog::local_identifier().getPath().length()+1);
+  error = row_drop_table_for_mysql(table_path_no_catalog.c_str(), trx,
+                                   session.getSqlCommand()
+                                   == SQLCOM_DROP_DB);
+  }
+
   session.setXaId(trx->id);
 
   /* Flush the log to reduce probability that the .frm files and
@@ -7287,7 +7314,7 @@
 
     prebuilt->trx->op_info = "returning various info to MySQL";
 
-    fs::path get_status_path(getDataHomeCatalog());
+    fs::path get_status_path(catalog::local_identifier().getPath());
     get_status_path /= ib_table->name;
     fs::change_extension(get_status_path, "dfe");
 
 
=== modified file 'plugin/innobase/tests/r/innodb-system-table-view.result'
--- plugin/innobase/tests/r/innodb-system-table-view.result	2011-04-29 18:45:16 +0000
+++ plugin/innobase/tests/r/innodb-system-table-view.result	2012-01-05 00:31:36 +0000
@@ -58,23 +58,23 @@
 ON DELETE CASCADE) ENGINE=INNODB;
 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN;
 ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-test/constraint_test	test/child	test/parent	1	1
+local/test/constraint_test	local/test/child	local/test/parent	1	1
 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN_COLS;
 ID	FOR_COL_NAME	REF_COL_NAME	POS
-test/constraint_test	parent_id	id	0
+local/test/constraint_test	parent_id	id	0
 INSERT INTO parent VALUES(1);
 SELECT name, num_rows, handles_opened
 FROM DATA_DICTIONARY.INNODB_SYS_TABLESTATS
 WHERE name LIKE "%parent";
 name	num_rows	handles_opened
-test/parent	1	1
+local/test/parent	1	1
 SELECT NAME, FLAG, N_COLS, SPACE FROM DATA_DICTIONARY.INNODB_SYS_TABLES;
 NAME	FLAG	N_COLS	SPACE
 SYS_FOREIGN	0	7	0
 SYS_FOREIGN_COLS	0	7	0
 SYS_REPLICATION_LOG	0	11	0
-test/child	1	5	0
-test/parent	1	4	0
+local/test/child	1	5	0
+local/test/parent	1	4	0
 SELECT name, n_fields
 from DATA_DICTIONARY.INNODB_SYS_INDEXES
 WHERE table_id In (SELECT table_id from
@@ -109,11 +109,11 @@
 ON DELETE CASCADE) ENGINE=INNODB;
 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN;
 ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-test/constraint_test	test/child	test/parent	2	1
+local/test/constraint_test	local/test/child	local/test/parent	2	1
 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN_COLS;
 ID	FOR_COL_NAME	REF_COL_NAME	POS
-test/constraint_test	id	id	0
-test/constraint_test	parent_id	newid	1
+local/test/constraint_test	id	id	0
+local/test/constraint_test	parent_id	newid	1
 INSERT INTO parent VALUES(1, 9);
 SELECT * FROM parent WHERE id IN (SELECT id FROM parent);
 id	newid
@@ -122,6 +122,6 @@
 FROM DATA_DICTIONARY.INNODB_SYS_TABLESTATS
 WHERE name LIKE "%parent";
 name	num_rows	handles_opened
-test/parent	1	2
+local/test/parent	1	2
 DROP TABLE child;
 DROP TABLE parent;
 
=== modified file 'plugin/schema_engine/schema.cc'
--- plugin/schema_engine/schema.cc	2011-10-18 13:52:19 +0000
+++ plugin/schema_engine/schema.cc	2012-01-05 00:31:36 +0000
@@ -26,7 +26,7 @@
 #include <drizzled/sql_table.h>
 #include <drizzled/charset.h>
 #include <drizzled/cursor.h>
-#include <drizzled/data_home.h>
+#include <drizzled/catalog/local.h>
 
 #include <drizzled/pthread_globals.h>
 
@@ -71,7 +71,9 @@
 
 void Schema::prime()
 {
-  CachedDirectory directory(getDataHomeCatalog().file_string(), CachedDirectory::DIRECTORY);
+  CachedDirectory directory(catalog::local_identifier().getPath(),
+                            CachedDirectory::DIRECTORY, true);
+
   CachedDirectory::Entries files= directory.getEntries();
   boost::unique_lock<boost::shared_mutex> scopedLock(mutex);
 
@@ -80,7 +82,12 @@
     if (not entry->filename.compare(GLOBAL_TEMPORARY_EXT))
       continue;
     message::Schema schema_message;
-    if (readSchemaFile(entry->filename, schema_message))
+
+    std::string filename= catalog::local_identifier().getPath();
+    filename+= FN_LIBCHAR;
+    filename+= entry->filename;
+
+    if (readSchemaFile(filename, schema_message))
     {
       identifier::Schema schema_identifier(schema_message.name());
 
 
=== modified file 'plugin/table_cache_dictionary/tests/r/table_cache.result'
--- plugin/table_cache_dictionary/tests/r/table_cache.result	2011-04-28 02:29:52 +0000
+++ plugin/table_cache_dictionary/tests/r/table_cache.result	2012-01-05 00:31:36 +0000
@@ -17,14 +17,14 @@
 flush tables;
 select * FROM data_dictionary.TABLE_CACHE ORDER BY TABLE_SCHEMA, TABLE_NAME;
 SESSION_ID	TABLE_SCHEMA	TABLE_NAME	VERSION	IS_NAME_LOCKED	ROWS	AVG_ROW_LENGTH	TABLE_SIZE	AUTO_INCREMENT
-#	data_dictionary	table_cache	#	#	#	2112	#	#
+#	data_dictionary	TABLE_CACHE	#	#	#	2112	#	#
 create table a ( a int);
 create table b ( b int);
 select * FROM a CROSS JOIN b;
 a	b
 select * FROM data_dictionary.TABLE_CACHE ORDER BY TABLE_SCHEMA, TABLE_NAME;
 SESSION_ID	TABLE_SCHEMA	TABLE_NAME	VERSION	IS_NAME_LOCKED	ROWS	AVG_ROW_LENGTH	TABLE_SIZE	AUTO_INCREMENT
-#	data_dictionary	table_cache	#	#	#	2112	#	#
+#	data_dictionary	TABLE_CACHE	#	#	#	2112	#	#
 #	test	a	#	#	#	6	#	#
 #	test	b	#	#	#	6	#	#
 DROP TABLES a,b;
 
=== modified file 'plugin/table_cache_dictionary/tests/r/table_definition_cache.result'
--- plugin/table_cache_dictionary/tests/r/table_definition_cache.result	2011-04-28 02:29:52 +0000
+++ plugin/table_cache_dictionary/tests/r/table_definition_cache.result	2012-01-05 00:31:36 +0000
@@ -13,14 +13,14 @@
 flush tables;
 select * FROM data_dictionary.TABLE_DEFINITION_CACHE  ORDER BY TABLE_SCHEMA, TABLE_NAME;
 TABLE_SCHEMA	TABLE_NAME	VERSION	TABLE_COUNT	IS_NAME_LOCKED
-#	table_definition_cache	#	#	#
+#	TABLE_DEFINITION_CACHE	#	#	#
 create table a ( a int);
 create table b ( b int);
 select * FROM a CROSS JOIN b;
 a	b
 select * FROM data_dictionary.TABLE_DEFINITION_CACHE  ORDER BY TABLE_SCHEMA, TABLE_NAME;
 TABLE_SCHEMA	TABLE_NAME	VERSION	TABLE_COUNT	IS_NAME_LOCKED
-#	table_definition_cache	#	#	#
+#	TABLE_DEFINITION_CACHE	#	#	#
 #	a	#	#	#
 #	b	#	#	#
 DROP TABLES a,b;
 
=== modified file 'plugin/tableprototester/tableprototester.cc'
--- plugin/tableprototester/tableprototester.cc	2011-04-20 22:18:30 +0000
+++ plugin/tableprototester/tableprototester.cc	2012-01-05 00:31:36 +0000
@@ -118,11 +118,11 @@
 
 bool TableProtoTesterEngine::doDoesTableExist(Session&, const drizzled::identifier::Table &identifier)
 {
-  if (not identifier.getPath().compare("test/t1"))
-    return true;
-  if (not identifier.getPath().compare("test/too_many_enum_values"))
-    return true;
-  if (not identifier.getPath().compare("test/invalid_table_collation"))
+  if (not identifier.getPath().compare("local/test/t1"))
+    return true;
+  if (not identifier.getPath().compare("local/test/too_many_enum_values"))
+    return true;
+  if (not identifier.getPath().compare("local/test/invalid_table_collation"))
     return true;
 
   return false;
@@ -239,17 +239,17 @@
                                                  const drizzled::identifier::Table &identifier,
                                                  drizzled::message::Table &table_proto)
 {
-  if (not identifier.getPath().compare("test/t1"))
+  if (not identifier.getPath().compare("local/test/t1"))
   {
     fill_table1(table_proto);
     return EEXIST;
   }
-  else if (not identifier.getPath().compare("test/too_many_enum_values"))
+  else if (not identifier.getPath().compare("local/test/too_many_enum_values"))
   {
     fill_table_too_many_enum_values(table_proto);
     return EEXIST;
   }
-  else if (not identifier.getPath().compare("test/invalid_table_collation"))
+  else if (not identifier.getPath().compare("local/test/invalid_table_collation"))
   {
     fill_table_invalid_table_collation(table_proto);
     return EEXIST;
 
=== modified file 'plugin/transaction_log/hexdump_transaction_message.cc'
--- plugin/transaction_log/hexdump_transaction_message.cc	2011-08-22 19:14:08 +0000
+++ plugin/transaction_log/hexdump_transaction_message.cc	2012-01-05 00:31:36 +0000
@@ -99,7 +99,7 @@
    * a pool of TransactionLogReader objects that can be 
    * re-used.
    */
-  const string &filename= transaction_log->getLogFilename();
+  const string &filename= transaction_log->getLogFilepath();
   int log_file= open(filename.c_str(), O_RDONLY);
   if (log_file == -1)
   {
 
=== modified file 'plugin/transaction_log/module.cc'
--- plugin/transaction_log/module.cc	2011-06-24 13:24:06 +0000
+++ plugin/transaction_log/module.cc	2012-01-05 00:31:36 +0000
@@ -56,7 +56,7 @@
  * The name of the main transaction log file on disk.  With no prefix,
  * this goes into Drizzle's $datadir.
  */
-static const char DEFAULT_LOG_FILE_PATH[]= "transaction.log"; /* In datadir... */
+static const char DEFAULT_LOG_FILE_PATH[]= "local/transaction.log"; /* In datadir... */
 /** 
  * Transaction Log plugin system variable - Is the log enabled? Only used on init().  
  */
 
=== modified file 'plugin/transaction_log/print_transaction_message.cc'
--- plugin/transaction_log/print_transaction_message.cc	2011-04-14 21:56:22 +0000
+++ plugin/transaction_log/print_transaction_message.cc	2012-01-05 00:31:36 +0000
@@ -99,7 +99,7 @@
    * a pool of TransactionLogReader objects that can be 
    * re-used.
    */
-  const string &filename= transaction_log->getLogFilename();
+  const string &filename= transaction_log->getLogFilepath();
   int log_file= open(filename.c_str(), O_RDONLY);
   if (log_file == -1)
   {
 
=== modified file 'plugin/transaction_log/tests/r/bug660779.result'
--- plugin/transaction_log/tests/r/bug660779.result	2011-01-11 14:22:54 +0000
+++ plugin/transaction_log/tests/r/bug660779.result	2012-01-05 00:31:36 +0000
@@ -15,8 +15,8 @@
 COMMIT;
 
 We should have a Transaction with a single insert Statement
-SELECT PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
-PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS))
+SELECT PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS))
 transaction_context {
   server_id: 1
   TRANSACTION_ID
@@ -75,8 +75,8 @@
 COMMIT;
 
 We should have a Transaction with 1 update and 1 insert Statement
-SELECT PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
-PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS))
+SELECT PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS))
 transaction_context {
   server_id: 1
   TRANSACTION_ID
@@ -169,8 +169,8 @@
 COMMIT;
 
 We should have a Transaction with 1 insert Statement
-SELECT PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
-PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS))
+SELECT PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS))
 transaction_context {
   server_id: 1
   TRANSACTION_ID
 
=== added file 'plugin/transaction_log/tests/r/bug911643.result'
--- plugin/transaction_log/tests/r/bug911643.result	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/r/bug911643.result	2012-01-05 00:31:36 +0000
@@ -0,0 +1,71 @@
+CREATE TABLE t1 (
+pk INT NOT NULL AUTO_INCREMENT,
+col_int1 INT,
+col_int2 INT,
+col_int_not_null INT NOT NULL,
+PRIMARY KEY (pk));
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (1,1,1);
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (NULL,1,1);
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (2,1,3);
+SET GLOBAL transaction_log_truncate_debug= true;
+BEGIN;
+UPDATE t1 SET col_int_not_null = col_int1 WHERE col_int2 = 1;
+ERROR 23000: Column 'col_int_not_null' cannot be null
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (5,5,5);
+COMMIT;
+
+We should have a Transaction with a single insert Statement
+SELECT PRINT_TRANSACTION_MESSAGE('test/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+PRINT_TRANSACTION_MESSAGE('test/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS))
+transaction_context {
+  server_id: 1
+  TRANSACTION_ID
+  START_TIMESTAMP
+  END_TIMESTAMP
+}
+statement {
+  type: INSERT
+  START_TIMESTAMP
+  END_TIMESTAMP
+  insert_header {
+    table_metadata {
+      schema_name: "test"
+      table_name: "t1"
+    }
+    field_metadata {
+      type: INTEGER
+      name: "pk"
+    }
+    field_metadata {
+      type: INTEGER
+      name: "col_int1"
+    }
+    field_metadata {
+      type: INTEGER
+      name: "col_int2"
+    }
+    field_metadata {
+      type: INTEGER
+      name: "col_int_not_null"
+    }
+  }
+  insert_data {
+    segment_id: 1
+    end_segment: true
+    record {
+      insert_value: "4"
+      insert_value: "5"
+      insert_value: "5"
+      insert_value: "5"
+      is_null: false
+      is_null: false
+      is_null: false
+      is_null: false
+    }
+  }
+}
+segment_id: 1
+end_segment: true
+
+DROP TABLE t1;
+SET GLOBAL transaction_log_truncate_debug= true;
 
=== modified file 'plugin/transaction_log/tests/r/variables.result'
--- plugin/transaction_log/tests/r/variables.result	2010-08-21 19:42:55 +0000
+++ plugin/transaction_log/tests/r/variables.result	2012-01-05 00:31:36 +0000
@@ -3,7 +3,7 @@
 VARIABLE_NAME	VARIABLE_VALUE
 transaction_log_enable	ON
 transaction_log_enable_checksum	OFF
-transaction_log_file	transaction.log
+transaction_log_file	local/transaction.log
 transaction_log_flush_frequency	1
 transaction_log_num_write_buffers	8
 transaction_log_truncate_debug	OFF
 
=== modified file 'plugin/transaction_log/tests/t/bug660779.test'
--- plugin/transaction_log/tests/t/bug660779.test	2010-10-29 02:01:29 +0000
+++ plugin/transaction_log/tests/t/bug660779.test	2012-01-05 00:31:36 +0000
@@ -22,7 +22,7 @@
 --echo We should have a Transaction with a single insert Statement
 --replace_regex /transaction_id: [0-9]+/TRANSACTION_ID/ /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g /creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/
 
-SELECT PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+SELECT PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
 
 BEGIN;
 UPDATE t1 SET col_int1 = (col_int1 + 1) WHERE col_int2 = 1;
@@ -35,7 +35,7 @@
 --echo We should have a Transaction with 1 update and 1 insert Statement
 --replace_regex /transaction_id: [0-9]+/TRANSACTION_ID/ /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g /creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/
 
-SELECT PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+SELECT PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
 
 CREATE TABLE t2 (pk INT NOT NULL AUTO_INCREMENT PRIMARY KEY, a INT);
 INSERT INTO t2 (a) VALUES (1),(2), (NULL);
@@ -50,7 +50,7 @@
 --echo We should have a Transaction with 1 insert Statement
 --replace_regex /transaction_id: [0-9]+/TRANSACTION_ID/ /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g /creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/
 
-SELECT PRINT_TRANSACTION_MESSAGE('transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+SELECT PRINT_TRANSACTION_MESSAGE('local/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
 
 
 DROP TABLE t1;
 
=== added file 'plugin/transaction_log/tests/t/bug911643-master.opt'
--- plugin/transaction_log/tests/t/bug911643-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/t/bug911643-master.opt	2012-01-05 00:31:36 +0000
@@ -0,0 +1,1 @@
+--transaction-log.enable --scheduler=multi_thread  --transaction-message-threshold=131072 --allow-all-authentication.allow_anonymous=true --transaction-log.file=local/test/transaction.log
 
=== added file 'plugin/transaction_log/tests/t/bug911643.test'
--- plugin/transaction_log/tests/t/bug911643.test	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/t/bug911643.test	2012-01-05 00:31:36 +0000
@@ -0,0 +1,28 @@
+CREATE TABLE t1 (
+  pk INT NOT NULL AUTO_INCREMENT,
+  col_int1 INT,
+  col_int2 INT,
+  col_int_not_null INT NOT NULL,
+  PRIMARY KEY (pk));
+
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (1,1,1);
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (NULL,1,1);
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (2,1,3);
+
+SET GLOBAL transaction_log_truncate_debug= true;
+
+--test with no previous Statement message
+BEGIN;
+--ERROR ER_BAD_NULL_ERROR
+UPDATE t1 SET col_int_not_null = col_int1 WHERE col_int2 = 1;
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (5,5,5);
+COMMIT;
+
+--echo
+--echo We should have a Transaction with a single insert Statement
+--replace_regex /transaction_id: [0-9]+/TRANSACTION_ID/ /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g /creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/
+
+SELECT PRINT_TRANSACTION_MESSAGE('test/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+
+DROP TABLE t1;
+SET GLOBAL transaction_log_truncate_debug= true;
 
=== modified file 'tests/r/broken_table_proto_file.result'
--- tests/r/broken_table_proto_file.result	2011-01-12 22:54:12 +0000
+++ tests/r/broken_table_proto_file.result	2012-01-05 00:31:36 +0000
@@ -2,6 +2,6 @@
 SHOW TABLE STATUS like 't1';
 Session	Schema	Name	Type	Engine	Version	Rows	Avg_row_length	Table_size	Auto_increment
 show create table t1;
-ERROR HY000: Corrupt or invalid table definition for 'test/t1.dfe': name, schema, type, engine, creation_timestamp, update_timestamp
+ERROR HY000: Corrupt or invalid table definition for 'local/test/t1.dfe': name, schema, type, engine, creation_timestamp, update_timestamp
 drop table if exists t1;
 Got one of the listed errors
 
=== modified file 'tests/r/show_check.result'
--- tests/r/show_check.result	2011-07-15 08:26:31 +0000
+++ tests/r/show_check.result	2012-01-05 00:31:36 +0000
@@ -26,11 +26,11 @@
 test.t1	check	status	OK
 show index from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	data_dictionary	show_indexes	SHOW_INDEXES	Table	Table	8	1024	2	N	4097	0	45
-def	data_dictionary	show_indexes	SHOW_INDEXES	Unique	Unique	13	1	1	N	36897	0	63
-def	data_dictionary	show_indexes	SHOW_INDEXES	Key_name	Key_name	8	1024	7	N	4097	0	45
-def	data_dictionary	show_indexes	SHOW_INDEXES	Seq_in_index	Seq_in_index	5	21	1	N	36865	0	63
-def	data_dictionary	show_indexes	SHOW_INDEXES	Column_name	Column_name	8	1024	1	N	4097	0	45
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Table	Table	8	1024	2	N	4097	0	45
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Unique	Unique	13	1	1	N	36897	0	63
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Key_name	Key_name	8	1024	7	N	4097	0	45
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Seq_in_index	Seq_in_index	5	21	1	N	36865	0	63
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Column_name	Column_name	8	1024	1	N	4097	0	45
 Table	Unique	Key_name	Seq_in_index	Column_name
 t1	YES	PRIMARY	1	a
 t1	NO	b	1	b
@@ -48,37 +48,37 @@
 -- after Bug#29394 is implemented.
 show variables like "server_id%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	9	N	4097	0	45
-def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	1	N	4097	0	45
+def	data_dictionary	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	9	N	4097	0	45
+def	data_dictionary	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	1	N	4097	0	45
 Variable_name	Value
 server_id	1
 show variables like "SERVER_id%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	9	N	4097	0	45
-def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	1	N	4097	0	45
+def	data_dictionary	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	9	N	4097	0	45
+def	data_dictionary	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	1	N	4097	0	45
 Variable_name	Value
 server_id	1
 show variables like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	0	N	4097	0	45
-def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	0	N	4097	0	45
+def	data_dictionary	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	0	N	4097	0	45
+def	data_dictionary	SESSION_VARIABLES	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	0	N	4097	0	45
 Variable_name	Value
 show table status from test like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Session	Session	5	21	0	N	36865	0	63
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Schema	Schema	8	1024	0	N	4097	0	45
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Name	Name	8	1024	0	N	4097	0	45
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Type	Type	8	1024	0	N	4097	0	45
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Engine	Engine	8	1024	0	N	4097	0	45
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Version	Version	8	1024	0	N	4097	0	45
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Rows	Rows	8	1024	0	N	4097	0	45
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Avg_row_length	Avg_row_length	8	1024	0	N	4097	0	45
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Table_size	Table_size	8	1024	0	N	4097	0	45
-def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Auto_increment	Auto_increment	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Session	Session	5	21	0	N	36865	0	63
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Schema	Schema	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Name	Name	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Type	Type	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Engine	Engine	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Version	Version	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Rows	Rows	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Avg_row_length	Avg_row_length	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Table_size	Table_size	8	1024	0	N	4097	0	45
+def	data_dictionary	SHOW_TABLE_STATUS	SHOW_TABLE_STATUS	Auto_increment	Auto_increment	8	1024	0	N	4097	0	45
 Session	Schema	Name	Type	Engine	Version	Rows	Avg_row_length	Table_size	Auto_increment
 show databases;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	data_dictionary	show_schemas	SHOW_SCHEMAS	SCHEMA_NAME	Database	8	1024	18	N	4097	0	45
+def	data_dictionary	SHOW_SCHEMAS	SHOW_SCHEMAS	SCHEMA_NAME	Database	8	1024	18	N	4097	0	45
 Database
 DATA_DICTIONARY
 INFORMATION_SCHEMA
@@ -86,7 +86,7 @@
 test
 show databases like "test%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	data_dictionary	show_schemas	SHOW_SCHEMAS	SCHEMA_NAME	Database (test%)	8	1024	4	N	4097	0	45
+def	data_dictionary	SHOW_SCHEMAS	SHOW_SCHEMAS	SCHEMA_NAME	Database (test%)	8	1024	4	N	4097	0	45
 Database (test%)
 test
 create table t1 (f1 int not null, f2 int not null, f3 int not null, f4 int not null, primary key(f1,f2,f3,f4));
@@ -446,11 +446,11 @@
 );
 show index from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	data_dictionary	show_indexes	SHOW_INDEXES	Table	Table	8	1024	2	N	4097	0	45
-def	data_dictionary	show_indexes	SHOW_INDEXES	Unique	Unique	13	1	1	N	36897	0	63
-def	data_dictionary	show_indexes	SHOW_INDEXES	Key_name	Key_name	8	1024	7	N	4097	0	45
-def	data_dictionary	show_indexes	SHOW_INDEXES	Seq_in_index	Seq_in_index	5	21	1	N	36865	0	63
-def	data_dictionary	show_indexes	SHOW_INDEXES	Column_name	Column_name	8	1024	6	N	4097	0	45
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Table	Table	8	1024	2	N	4097	0	45
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Unique	Unique	13	1	1	N	36897	0	63
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Key_name	Key_name	8	1024	7	N	4097	0	45
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Seq_in_index	Seq_in_index	5	21	1	N	36865	0	63
+def	data_dictionary	SHOW_INDEXES	SHOW_INDEXES	Column_name	Column_name	8	1024	6	N	4097	0	45
 Table	Unique	Key_name	Seq_in_index	Column_name
 t1	YES	PRIMARY	1	field1
 drop table t1;
 
=== modified file 'unittests/table_identifier.cc'
--- unittests/table_identifier.cc	2011-07-07 11:47:49 +0000
+++ unittests/table_identifier.cc	2012-01-05 00:31:36 +0000
@@ -63,14 +63,21 @@
 
   const identifier::Table::Key key= identifier.getKey();
 
-  BOOST_REQUIRE_EQUAL(key.size(), 7);
-  BOOST_REQUIRE_EQUAL(key.vector()[0], 't');
-  BOOST_REQUIRE_EQUAL(key.vector()[1], 'e');
-  BOOST_REQUIRE_EQUAL(key.vector()[2], 's');
-  BOOST_REQUIRE_EQUAL(key.vector()[3], 't');
-  BOOST_REQUIRE_EQUAL(key.vector()[4], 0);
-  BOOST_REQUIRE_EQUAL(key.vector()[5], 'a');
-  BOOST_REQUIRE_EQUAL(key.vector()[6], 0);
+  BOOST_REQUIRE_EQUAL(key.size(), 13);
+  int i=0;
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 'L');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 'O');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 'C');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 'A');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 'L');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 0);
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 't');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 'e');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 's');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 't');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 0);
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 'a');
+  BOOST_REQUIRE_EQUAL(key.vector()[i++], 0);
 }
 
 BOOST_AUTO_TEST_CASE(KeyCompare)