← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2010-02-16 07:18:35 UTC
  • mto: (1471.3.2 drizzled-as-lib)
  • mto: This revision was merged to the branch mainline in revision 1479.
  • Revision ID: mordred@inaugust.com-20100216071835-usfwjo51l04tobm1
Removed drizzle_ prefix from some things that don't need it since they're
in a namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
289
289
char drizzle_home[FN_REFLEN], pidfile_name[FN_REFLEN], system_time_zone[30];
290
290
char *default_tz_name;
291
291
char glob_hostname[FN_REFLEN];
292
 
char drizzle_real_data_home[FN_REFLEN],
 
292
char data_home_real[FN_REFLEN],
293
293
     language[FN_REFLEN], 
294
294
     *opt_tc_log_file;
295
 
char drizzle_unpacked_real_data_home[FN_REFLEN];
 
295
char data_home_real_unpacked[FN_REFLEN];
296
296
const key_map key_map_empty(0);
297
297
key_map key_map_full(0);                        // Will be initialized later
298
298
 
299
 
uint32_t drizzle_data_home_len;
300
 
char drizzle_data_home_buff[2], *drizzle_data_home=drizzle_real_data_home;
 
299
uint32_t data_home_len;
 
300
char data_home_buff[2], *data_home=data_home_real;
301
301
char *drizzle_tmpdir= NULL;
302
302
char *opt_drizzle_tmpdir= NULL;
303
303
 
1285
1285
   NO_ARG, 0, 0, 0, 0, 0, 0},
1286
1286
  {"datadir", 'h',
1287
1287
   N_("Path to the database root."),
1288
 
   (char**) &drizzle_data_home,
1289
 
   (char**) &drizzle_data_home, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 
1288
   (char**) &data_home,
 
1289
   (char**) &data_home, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1290
1290
  {"default-storage-engine", OPT_STORAGE_ENGINE,
1291
1291
   N_("Set the default storage engine (table type) for tables."),
1292
1292
   (char**)&default_storage_engine_str, (char**)&default_storage_engine_str,
1662
1662
  drizzle_home_ptr= drizzle_home;
1663
1663
  pidfile_name_ptr= pidfile_name;
1664
1664
  language_ptr= language;
1665
 
  drizzle_data_home= drizzle_real_data_home;
 
1665
  data_home= data_home_real;
1666
1666
  session_startup_options= (OPTION_AUTO_IS_NULL | OPTION_SQL_NOTES);
1667
1667
  refresh_version= 1L;  /* Increments on each reload */
1668
1668
  global_thread_id= 1UL;
1670
1670
 
1671
1671
  /* Set directory paths */
1672
1672
  strncpy(language, LANGUAGE, sizeof(language)-1);
1673
 
  strncpy(drizzle_real_data_home, get_relative_path(LOCALSTATEDIR),
1674
 
          sizeof(drizzle_real_data_home)-1);
1675
 
  drizzle_data_home_buff[0]=FN_CURLIB;  // all paths are relative from here
1676
 
  drizzle_data_home_buff[1]=0;
1677
 
  drizzle_data_home_len= 2;
 
1673
  strncpy(data_home_real, get_relative_path(LOCALSTATEDIR),
 
1674
          sizeof(data_home_real)-1);
 
1675
  data_home_buff[0]=FN_CURLIB;  // all paths are relative from here
 
1676
  data_home_buff[1]=0;
 
1677
  data_home_len= 2;
1678
1678
 
1679
1679
  /* Variables in libraries */
1680
1680
  default_character_set_name= "utf8";
1721
1721
      default_collation_name= 0;
1722
1722
    break;
1723
1723
  case 'h':
1724
 
    strncpy(drizzle_real_data_home,argument, sizeof(drizzle_real_data_home)-1);
 
1724
    strncpy(data_home_real,argument, sizeof(data_home_real)-1);
1725
1725
    /* Correct pointer set by my_getopt (for embedded library) */
1726
 
    drizzle_data_home= drizzle_real_data_home;
1727
 
    drizzle_data_home_len= strlen(drizzle_data_home);
 
1726
    data_home= data_home_real;
 
1727
    data_home_len= strlen(data_home);
1728
1728
    break;
1729
1729
  case 'u':
1730
1730
    if (!drizzled_user || !strcmp(drizzled_user, argument))
1909
1909
    pos[0]= FN_LIBCHAR;
1910
1910
    pos[1]= 0;
1911
1911
  }
1912
 
  internal::convert_dirname(drizzle_real_data_home,drizzle_real_data_home,NULL);
1913
 
  (void) internal::fn_format(buff, drizzle_real_data_home, "", "",
 
1912
  internal::convert_dirname(data_home_real,data_home_real,NULL);
 
1913
  (void) internal::fn_format(buff, data_home_real, "", "",
1914
1914
                   (MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS));
1915
 
  (void) internal::unpack_dirname(drizzle_unpacked_real_data_home, buff);
 
1915
  (void) internal::unpack_dirname(data_home_real_unpacked, buff);
1916
1916
  internal::convert_dirname(language,language,NULL);
1917
1917
  (void) internal::my_load_path(drizzle_home, drizzle_home,""); // Resolve current dir
1918
 
  (void) internal::my_load_path(drizzle_real_data_home, drizzle_real_data_home,drizzle_home);
1919
 
  (void) internal::my_load_path(pidfile_name, pidfile_name,drizzle_real_data_home);
 
1918
  (void) internal::my_load_path(data_home_real, data_home_real,drizzle_home);
 
1919
  (void) internal::my_load_path(pidfile_name, pidfile_name,data_home_real);
1920
1920
 
1921
1921
  if (opt_plugin_dir_ptr == NULL)
1922
1922
  {