Merge lp:~stewart/drizzle/bug707323 into lp:drizzle

[Stewart Smith]

use API calls rather than exported variables

=== modified file 'client/drizzletest.cc'
--- client/drizzletest.cc	2013-02-14 11:36:21 +0000
+++ client/drizzletest.cc	2013-08-08 07:32:36 +0000
@@ -2355,7 +2355,7 @@
                      mkdir_args, sizeof(mkdir_args)/sizeof(struct command_arg),
                      ' ');
 
-  int error= mkdir(ds_dirname.c_str(), (0777 & internal::my_umask_dir)) != 0;
+  int error= mkdir(ds_dirname.c_str(), (0777 & internal::get_my_umask_dir())) != 0;
   handle_command_error(command, error);
 }
 
 
=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2013-02-28 22:27:42 +0000
+++ drizzled/drizzled.cc	2013-08-08 07:32:36 +0000
@@ -1099,7 +1099,7 @@
 
 bool init_variables_before_daemonizing(int argc, char **argv)
 {
-  umask(((~internal::my_umask) & 0666));
+  umask(((~internal::get_my_umask()) & 0666));
   decimal_zero.set_zero(); // set decimal_zero constant;
   tzset();			// Set tzname
 
 
=== modified file 'drizzled/internal/my_static.cc'
--- drizzled/internal/my_static.cc	2013-02-27 02:30:19 +0000
+++ drizzled/internal/my_static.cc	2013-08-08 07:32:36 +0000
@@ -37,8 +37,10 @@
 const char      *my_progname=0;
 char curr_dir[FN_REFLEN]= {0},
      home_dir_buff[FN_REFLEN]= {0};
-DRIZZLED_API int my_umask=0664;
+int my_umask=0664;
+int get_my_umask() { return my_umask; }
 int my_umask_dir=0777;
+int get_my_umask_dir() { return my_umask_dir; }
 
 	/* From mf_brkhant */
 volatile int		_my_signals=0;
 
=== modified file 'drizzled/internal/my_sys.h'
--- drizzled/internal/my_sys.h	2013-02-27 02:30:19 +0000
+++ drizzled/internal/my_sys.h	2013-08-08 07:32:36 +0000
@@ -206,6 +206,8 @@
 DRIZZLED_API void my_store_ptr(unsigned char *buff, size_t pack_length, my_off_t pos);
 DRIZZLED_API my_off_t my_get_ptr(unsigned char *ptr, size_t pack_length);
 int create_temp_file(char *to, const char *dir, const char *pfx, myf MyFlags);
+int get_my_umask();
+int get_my_umask_dir();
 
 } /* namespace internal */
 } /* namespace drizzled */
 
=== modified file 'drizzled/plugin/storage_engine.cc'
--- drizzled/plugin/storage_engine.cc	2012-07-11 14:06:00 +0000
+++ drizzled/plugin/storage_engine.cc	2013-08-08 07:32:36 +0000
@@ -75,6 +75,11 @@
   return g_schema_engines;
 }
 
+const std::string defaultTableDefinitionFileExt()
+{
+  return DEFAULT_DEFINITION_FILE_EXT;
+}
+
 StorageEngine::StorageEngine(const std::string &name_arg,
                              const std::bitset<HTON_BIT_SIZE> &flags_arg) :
   Plugin(name_arg, "StorageEngine"),
@@ -150,7 +155,7 @@
 
   if (engine->getTableDefinitionFileExtension().length())
   {
-    assert(engine->getTableDefinitionFileExtension().length() == DEFAULT_DEFINITION_FILE_EXT.length());
+    assert(engine->getTableDefinitionFileExtension().length() == plugin::defaultTableDefinitionFileExt().length());
     set_of_table_definition_ext.insert(engine->getTableDefinitionFileExtension());
   }
 
@@ -539,7 +544,7 @@
 
     /* We remove the file extension. */
     length= entry->filename.length();
-    entry->filename.resize(length - DEFAULT_DEFINITION_FILE_EXT.length());
+    entry->filename.resize(length - plugin::defaultTableDefinitionFileExt().length());
 
     path+= directory;
     path+= FN_LIBCHAR;
@@ -842,7 +847,7 @@
 {
   std::string path(identifier.getPath());
 
-  path.append(DEFAULT_DEFINITION_FILE_EXT);
+  path.append(plugin::defaultTableDefinitionFileExt());
 
   return internal::my_delete(path.c_str(), MYF(0));
 }
@@ -853,8 +858,8 @@
   std::string src_path(src.getPath());
   std::string dest_path(dest.getPath());
 
-  src_path.append(DEFAULT_DEFINITION_FILE_EXT);
-  dest_path.append(DEFAULT_DEFINITION_FILE_EXT);
+  src_path.append(plugin::defaultTableDefinitionFileExt());
+  dest_path.append(plugin::defaultTableDefinitionFileExt());
 
   bool was_read= StorageEngine::readTableFile(src_path.c_str(), table_message);
 
@@ -881,7 +886,7 @@
   char definition_file_tmp[FN_REFLEN];
   std::string file_name(identifier.getPath());
 
-  file_name.append(DEFAULT_DEFINITION_FILE_EXT);
+  file_name.append(plugin::defaultTableDefinitionFileExt());
 
   snprintf(definition_file_tmp, sizeof(definition_file_tmp), "%sXXXXXX", file_name.c_str());
 
 
=== modified file 'drizzled/plugin/storage_engine.h'
--- drizzled/plugin/storage_engine.h	2013-03-03 01:46:08 +0000
+++ drizzled/plugin/storage_engine.h	2013-08-08 07:32:36 +0000
@@ -109,8 +109,8 @@
 typedef std::set<std::string> TableNameList;
 
 extern const std::string UNKNOWN_STRING;
-extern DRIZZLED_API const std::string DEFAULT_DEFINITION_FILE_EXT;
 
+const std::string defaultTableDefinitionFileExt();
 
 /*
   StorageEngine is a singleton structure - one instance per storage engine -
 
=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2013-03-03 02:44:39 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2013-08-08 07:32:36 +0000
@@ -381,8 +381,6 @@
   NULL
 };
 
-#define DEFAULT_FILE_EXTENSION ".dfe" // Deep Fried Elephant
-
 static INNOBASE_SHARE *get_share(const char *table_name);
 static void free_share(INNOBASE_SHARE *share);
 
@@ -398,7 +396,7 @@
                             HTON_TABLE_SCAN_ON_INDEX |
                             HTON_HAS_FOREIGN_KEYS)
   {
-    table_definition_ext= plugin::DEFAULT_DEFINITION_FILE_EXT;
+    table_definition_ext= plugin::defaultTableDefinitionFileExt();
     addAlias("INNOBASE");
   }
 
@@ -626,7 +624,7 @@
 
     const char *ext= strchr(filename->c_str(), '.');
 
-    if (ext == NULL || system_charset_info->strcasecmp(ext, DEFAULT_FILE_EXTENSION) ||
+    if (ext == NULL || system_charset_info->strcasecmp(ext, plugin::defaultTableDefinitionFileExt().c_str()) ||
         (filename->compare(0, strlen(TMP_FILE_PREFIX), TMP_FILE_PREFIX) == 0))
     { }
     else
@@ -653,7 +651,7 @@
 bool InnobaseEngine::doDoesTableExist(Session &session, const identifier::Table &identifier)
 {
   string proto_path(identifier.getPath());
-  proto_path.append(DEFAULT_FILE_EXTENSION);
+  proto_path.append(plugin::defaultTableDefinitionFileExt());
 
   if (session.getMessageCache().doesTableMessageExist(identifier))
     return true;
@@ -677,7 +675,7 @@
                                          message::Table &table_proto)
 {
   string proto_path(identifier.getPath());
-  proto_path.append(DEFAULT_FILE_EXTENSION);
+  proto_path.append(plugin::defaultTableDefinitionFileExt());
 
   // First we check the temporary tables.
   if (session.getMessageCache().getTableMessage(identifier, table_proto))
@@ -2366,7 +2364,7 @@
     goto error;
   }
 
-  os_innodb_umask = (ulint)internal::my_umask;
+  os_innodb_umask = (ulint)internal::get_my_umask();
 
 
   /* Set InnoDB initialization parameters according to the values
@@ -6808,7 +6806,7 @@
       {
         string path(identifier.getPath());
 
-        path.append(DEFAULT_FILE_EXTENSION);
+        path.append(plugin::defaultTableDefinitionFileExt());
 
         (void)internal::my_delete(path.c_str(), MYF(0));
       }
@@ -6817,7 +6815,7 @@
     {
       string path(identifier.getPath());
 
-      path.append(DEFAULT_FILE_EXTENSION);
+      path.append(plugin::defaultTableDefinitionFileExt());
 
       (void)internal::my_delete(path.c_str(), MYF(0));
     }