← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge of Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
367
367
struct system_variables max_system_variables;
368
368
struct system_status_var global_status_var;
369
369
 
370
 
bitset<MAX_FIELDS> temp_pool;
 
370
MY_BITMAP temp_pool;
371
371
 
372
372
const CHARSET_INFO *system_charset_info, *files_charset_info ;
373
373
const CHARSET_INFO *table_alias_charset;
591
591
  free(drizzle_tmpdir);
592
592
  if (opt_secure_file_priv)
593
593
    free(opt_secure_file_priv);
 
594
  bitmap_free(&temp_pool);
594
595
 
595
596
  (void) unlink(pidfile_name);  // This may not always exist
596
597
 
1496
1497
  }
1497
1498
  global_system_variables.lc_time_names= my_default_lc_time_names;
1498
1499
 
 
1500
  if (use_temp_pool && bitmap_init(&temp_pool,0,1024,1))
 
1501
    return 1;
 
1502
 
1499
1503
  /* Reset table_alias_charset, now that lower_case_table_names is set. */
1500
1504
  lower_case_table_names= 1; /* This we need to look at */
1501
1505
  table_alias_charset= files_charset_info;