← 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-10-06 18:22:02 UTC
  • mto: (1818.1.1 build) (1821.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 1819.
  • Revision ID: mordred@inaugust.com-20101006182202-bzj2dpg6gnmbgghh
Fixed some more ICC warnings. How did I get started on this this morning?

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
204
204
 
205
205
/* static variables */
206
206
 
207
 
static bool opt_debugging= 0;
 
207
static bool opt_debugging= false;
208
208
static uint32_t wake_thread;
209
209
static char *drizzled_chroot;
210
210
static const char *default_character_set_name;
1277
1277
  N_("Set up signals usable for debugging"))
1278
1278
  ("lc-time-name", po::value<string>(),
1279
1279
  N_("Set the language used for the month names and the days of the week."))
1280
 
  ("log-warnings,W", po::value<string>(),
 
1280
  ("log-warnings,W", po::value<bool>(&global_system_variables.log_warnings)->default_value(false)->zero_tokens(),
1281
1281
  N_("Log some not critical warnings to the log file."))  
1282
1282
  ("pid-file", po::value<string>(),
1283
1283
  N_("Pid file used by drizzled."))
2164
2164
  max_system_variables.auto_increment_increment= UINT64_MAX;
2165
2165
  max_system_variables.auto_increment_offset= UINT64_MAX;
2166
2166
  max_system_variables.completion_type= 2;
2167
 
  max_system_variables.log_warnings= 1;
 
2167
  max_system_variables.log_warnings= true;
2168
2168
  max_system_variables.bulk_insert_buff_size= ULONG_MAX;
2169
2169
  max_system_variables.div_precincrement= DECIMAL_MAX_SCALE;
2170
2170
  max_system_variables.group_concat_max_len= ULONG_MAX;
2244
2244
    exit(0);
2245
2245
  }
2246
2246
 
2247
 
  if (vm.count("log-warnings"))
2248
 
  {
2249
 
    if (vm["log-warnings"].as<string>().empty())
2250
 
      global_system_variables.log_warnings++;
2251
 
    else if (vm["log-warnings"].as<string>().compare("0"))
2252
 
      global_system_variables.log_warnings= 0L;
2253
 
    else
2254
 
      global_system_variables.log_warnings= atoi(vm["log-warnings"].as<string>().c_str());
2255
 
  }
2256
 
 
2257
2247
  if (vm.count("exit-info"))
2258
2248
  {
2259
2249
    if (vm["exit-info"].as<long>())