← 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-09-29 16:49:08 UTC
  • mto: (1802.9.1 clean-doco)
  • mto: This revision was merged to the branch mainline in revision 1813.
  • Revision ID: mordred@inaugust.com-20100929164908-l6k68hzeo39m1fbh
https://launchpad.net/bugs/651271
Removed old language arg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
207
207
static bool opt_debugging= 0;
208
208
static uint32_t wake_thread;
209
209
static char *drizzled_chroot;
210
 
static char *language_ptr;
211
210
static const char *default_character_set_name;
212
211
static const char *character_set_filesystem_name;
213
212
static char *lc_time_names_name;
293
292
char *default_tz_name;
294
293
char glob_hostname[FN_REFLEN];
295
294
 
296
 
char language[FN_REFLEN], 
297
 
     *opt_tc_log_file;
 
295
char *opt_tc_log_file;
298
296
const key_map key_map_empty(0);
299
297
key_map key_map_full(0);                        // Will be initialized later
300
298
 
1277
1275
  N_("Used for debugging;  Use at your own risk!"))
1278
1276
  ("gdb", po::value<bool>(&opt_debugging)->default_value(false)->zero_tokens(),
1279
1277
  N_("Set up signals usable for debugging"))
1280
 
  ("language,L", po::value<string>(),
1281
 
  N_("(IGNORED)"))  
1282
1278
  ("lc-time-name", po::value<string>(),
1283
1279
  N_("Set the language used for the month names and the days of the week."))
1284
1280
  ("log-warnings,W", po::value<string>(),
1806
1802
   N_("Set up signals usable for debugging"),
1807
1803
   (char**) &opt_debugging, (char**) &opt_debugging,
1808
1804
   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
1809
 
  {"language", 'L',
1810
 
   N_("(IGNORED)"),
1811
 
   (char**) &language_ptr, (char**) &language_ptr, 0, GET_STR, REQUIRED_ARG,
1812
 
   0, 0, 0, 0, 0, 0},
1813
1805
  {"lc-time-names", OPT_LC_TIME_NAMES,
1814
1806
   N_("Set the language used for the month names and the days of the week."),
1815
1807
   (char**) &lc_time_names_name,
2152
2144
  /* Things with default values that are not zero */
2153
2145
  drizzle_home_ptr= drizzle_home;
2154
2146
  pidfile_name_ptr= pidfile_name;
2155
 
  language_ptr= language;
2156
2147
  session_startup_options= (OPTION_AUTO_IS_NULL | OPTION_SQL_NOTES);
2157
2148
  refresh_version= 1L;  /* Increments on each reload */
2158
2149
  global_thread_id= 1UL;
2159
2150
  getSessionList().clear();
2160
2151
 
2161
 
  /* Set directory paths */
2162
 
  strncpy(language, LANGUAGE, sizeof(language)-1);
2163
 
 
2164
2152
  /* Variables in libraries */
2165
2153
  default_character_set_name= "utf8";
2166
2154
  default_collation_name= (char *)compiled_default_collation_name;
2251
2239
                    vm["user"].as<string>().c_str(), drizzled_user);
2252
2240
  }
2253
2241
 
2254
 
  if (vm.count("language"))
2255
 
  {
2256
 
    strncpy(language, vm["language"].as<string>().c_str(), sizeof(language)-1);
2257
 
  }
2258
 
 
2259
2242
  if (vm.count("version"))
2260
2243
  {
2261
2244
    print_version();
2382
2365
    pos[0]= FN_LIBCHAR;
2383
2366
    pos[1]= 0;
2384
2367
  }
2385
 
  internal::convert_dirname(language,language,NULL);
2386
2368
  (void) internal::my_load_path(drizzle_home, drizzle_home,""); // Resolve current dir
2387
2369
 
2388
2370
  fs::path pid_file_path(pidfile_name);
2403
2385
    strncat(buff, sharedir, sizeof(buff)-strlen(drizzle_home)-1);
2404
2386
  }
2405
2387
  internal::convert_dirname(buff,buff,NULL);
2406
 
  (void) internal::my_load_path(language,language,buff);
2407
2388
 
2408
2389
  if (not opt_help)
2409
2390
  {