← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
167
167
 
168
168
/* Constants */
169
169
 
 
170
const string& drizzled_version()
 
171
{
 
172
  static const string DRIZZLED_VERSION(STRING_WITH_LEN(PANDORA_RELEASE_VERSION));
 
173
  return DRIZZLED_VERSION;
 
174
}
 
175
 
 
176
 
170
177
const char *show_comp_option_name[]= {"YES", "NO", "DISABLED"};
171
178
static const char *optimizer_switch_names[]=
172
179
{
537
544
 
538
545
static void clean_up(bool print_message)
539
546
{
540
 
  plugin::Registry &plugins= plugin::Registry::singleton();
541
547
  if (cleanup_done++)
542
548
    return;
543
549
 
545
551
  TableShare::cacheStop();
546
552
  set_var_free();
547
553
  free_charsets();
 
554
  ha_end();
 
555
  plugin::Registry &plugins= plugin::Registry::singleton();
548
556
  plugin_shutdown(plugins);
549
 
  ha_end();
550
557
  xid_cache_free();
551
558
  free_status_vars();
552
559
  if (defaults_argv)