← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merged from trunk.
Removed test_xml. Moved my_xml to mystrings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
208
208
 {&Arg_comparator::compare_row,        &Arg_comparator::compare_e_row},
209
209
 {&Arg_comparator::compare_decimal,    &Arg_comparator::compare_e_decimal}};
210
210
 
211
 
const char *log_output_names[] = { "NONE", "FILE", "TABLE", NullS};
212
 
static const unsigned int log_output_names_len[]= { 4, 4, 5, 0 };
 
211
const char *log_output_names[] = { "NONE", "FILE", NullS};
 
212
static const unsigned int log_output_names_len[]= { 4, 4, 0 };
213
213
TYPELIB log_output_typelib= {array_elements(log_output_names)-1,"",
214
214
                             log_output_names, 
215
215
                             (unsigned int *) log_output_names_len};
1746
1746
                      REFRESH_THREADS | REFRESH_HOSTS),
1747
1747
                     (TABLE_LIST*) 0, &not_used); // Flush logs
1748
1748
      }
1749
 
      /* reenable logs after the options were reloaded */
1750
 
      if (log_output_options & LOG_NONE)
1751
 
      {
1752
 
        logger.set_handlers(LOG_FILE,
1753
 
                            opt_slow_log ? LOG_TABLE : LOG_NONE,
1754
 
                            opt_log ? LOG_TABLE : LOG_NONE);
1755
 
      }
1756
 
      else
1757
 
      {
1758
 
        logger.set_handlers(LOG_FILE,
1759
 
                            opt_slow_log ? log_output_options : LOG_NONE,
1760
 
                            opt_log ? log_output_options : LOG_NONE);
1761
 
      }
 
1749
      logger.set_handlers(LOG_FILE,
 
1750
                          opt_slow_log ? log_output_options : LOG_NONE,
 
1751
                          opt_log ? log_output_options : LOG_NONE);
1762
1752
      break;
1763
1753
#ifdef USE_ONE_SIGNAL_HAND
1764
1754
    case THR_SERVER_ALARM: