← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merged Padraig.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
366
366
struct system_variables max_system_variables;
367
367
struct system_status_var global_status_var;
368
368
 
369
 
MY_BITMAP temp_pool;
 
369
ThreadSafeBitset temp_pool;
370
370
 
371
371
const CHARSET_INFO *system_charset_info, *files_charset_info ;
372
372
const CHARSET_INFO *table_alias_charset;
600
600
  free(drizzle_tmpdir);
601
601
  if (opt_secure_file_priv)
602
602
    free(opt_secure_file_priv);
603
 
  bitmap_free(&temp_pool);
604
603
 
605
604
  (void) unlink(pidfile_name);  // This may not always exist
606
605
 
1485
1484
  }
1486
1485
  global_system_variables.lc_time_names= my_default_lc_time_names;
1487
1486
 
1488
 
  if (use_temp_pool && bitmap_init(&temp_pool,0,1024,1))
1489
 
    return 1;
1490
 
 
1491
1487
  /* Reset table_alias_charset, now that lower_case_table_names is set. */
1492
1488
  lower_case_table_names= 1; /* This we need to look at */
1493
1489
  table_alias_charset= files_charset_info;