Merge lp:~mordred/drizzle/bug544303 into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

TableIdentifier was returning an object by value rather than by reference. I'm assuming that the GCC copy-on-write implementation inside of their std::string was allowing it to magically work on linux.

[Stewart Smith (stewart)]

just scary. we assume the previous stuff i was looking at was dbx being ass, or really corrupted and confused.

review: Approve

[Brian Aker (brianaker)]

Awesome! Thanks for catching the typo :)

review: Approve

=== modified file 'drizzled/plugin/storage_engine.cc'
--- drizzled/plugin/storage_engine.cc	2010-03-27 04:01:18 +0000
+++ drizzled/plugin/storage_engine.cc	2010-03-31 09:39:32 +0000
@@ -518,7 +518,7 @@
 {
   int error= 1;
   Table table;
-  TableShare share(identifier.getDBName().c_str(), 0, identifier.getTableName().c_str(), identifier.getPath().c_str());
+  TableShare share(identifier.getSchemaName().c_str(), 0, identifier.getTableName().c_str(), identifier.getPath().c_str());
   message::Table tmp_proto;
 
   if (parse_table_proto(session, table_message, &share) || open_table_from_share(&session, &share, "", 0, 0, &table))

=== modified file 'drizzled/sql_base.cc'
--- drizzled/sql_base.cc	2010-03-25 19:25:04 +0000
+++ drizzled/sql_base.cc	2010-03-31 09:39:32 +0000
@@ -2299,8 +2299,8 @@
   uint32_t key_length, path_length;
   TableList table_list;
 
-  table_list.db=         (char*) identifier.getDBName().c_str();
-  table_list.table_name= (char*) identifier.getTableName().c_str();
+  table_list.db=         const_cast<char*>(identifier.getSchemaName().c_str());
+  table_list.table_name= const_cast<char*>(identifier.getTableName().c_str());
   /* Create the cache_key for temporary tables */
   key_length= table_list.create_table_def_key(cache_key);
   path_length= identifier.getPath().length();

=== modified file 'drizzled/sql_table.cc'
--- drizzled/sql_table.cc	2010-03-26 20:07:44 +0000
+++ drizzled/sql_table.cc	2010-03-31 09:39:32 +0000
@@ -1438,7 +1438,7 @@
   if (create_info->row_type == ROW_TYPE_DYNAMIC)
     db_options|=HA_OPTION_PACK_RECORD;
 
-  set_table_default_charset(create_info, identifier.getDBName().c_str());
+  set_table_default_charset(create_info, identifier.getSchemaName().c_str());
 
   /* Build a Table object to pass down to the engine, and the do the actual create. */
   if (not mysql_prepare_create_table(session, create_info, table_proto, alter_info,

=== modified file 'drizzled/table_identifier.h'
--- drizzled/table_identifier.h	2010-03-26 19:56:34 +0000
+++ drizzled/table_identifier.h	2010-03-31 09:39:32 +0000
@@ -106,17 +106,12 @@
     path= new_path;
   }
 
-  const std::string &getDBName() const
-  {
-    return db;
-  }
-
   const std::string &getSchemaName() const
   {
     return db;
   }
 
-  const std::string getTableName() const
+  const std::string &getTableName() const
   {
     return table_name;
   }
@@ -128,7 +123,7 @@
     const char *type_str;
 
     output << "TableIdentifier:(";
-    output <<  identifier.getDBName();
+    output <<  identifier.getSchemaName();
     output << ", ";
     output << identifier.getTableName();
     output << ", ";

=== modified file 'plugin/schema_engine/schema.cc'
--- plugin/schema_engine/schema.cc	2010-03-27 04:01:18 +0000
+++ plugin/schema_engine/schema.cc	2010-03-31 09:39:32 +0000
@@ -81,7 +81,7 @@
   if (readTableFile(proto_path, table_proto))
     return EEXIST;
 
-  return -1;
+  return ENOENT;
 }
 
 void Schema::doGetTableNames(CachedDirectory &directory, string&, set<string>& set_of_names)

=== modified file 'tests/test-run.pl'
--- tests/test-run.pl	2010-03-23 23:50:56 +0000
+++ tests/test-run.pl	2010-03-31 09:39:32 +0000
@@ -3281,7 +3281,7 @@
   {
     # write init file for drizzled
     mtr_tofile($dbx_init_file,
-               "stop in drizzled::mysql_parse\n" .
+               "stop in __1cIdrizzledLmysql_parse6Fpn0AHSession_pkcI_v_\n" .
                "runargs $str\n" .
                "run\n" .
                "\n");