← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge Monty's remove-charset-macros branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
234
234
static uint32_t killed_threads;
235
235
static char *drizzled_user, *drizzled_chroot;
236
236
static char *language_ptr;
237
 
static char *default_character_set_name;
238
 
static char *character_set_filesystem_name;
 
237
static const char *default_character_set_name;
 
238
static const char *character_set_filesystem_name;
239
239
static char *lc_time_names_name;
240
240
static char *my_bind_addr_str;
241
241
static char *default_collation_name;
242
242
static char *default_storage_engine_str;
243
 
static char compiled_default_collation_name[]= DRIZZLE_DEFAULT_COLLATION_NAME;
 
243
static const char *compiled_default_collation_name= "utf8_general_ci";
244
244
 
245
245
/* Global variables */
246
246
 
1818
1818
  {"bind-address", OPT_BIND_ADDRESS, N_("IP address to bind to."),
1819
1819
   (char**) &my_bind_addr_str, (char**) &my_bind_addr_str, 0, GET_STR,
1820
1820
   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1821
 
  {"character-set-filesystem", OPT_CHARACTER_SET_FILESYSTEM,
1822
 
   N_("Set the filesystem character set."),
1823
 
   (char**) &character_set_filesystem_name,
1824
 
   (char**) &character_set_filesystem_name,
1825
 
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
1826
 
  {"character-set-server", 'C',
1827
 
   N_("Set the default character set."),
1828
 
   (char**) &default_character_set_name, (char**) &default_character_set_name,
1829
 
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
1830
1821
  {"chroot", 'r',
1831
1822
   N_("Chroot drizzled daemon during startup."),
1832
1823
   (char**) &drizzled_chroot, (char**) &drizzled_chroot, 0, GET_STR, REQUIRED_ARG,
2455
2446
  drizzle_data_home_len= 2;
2456
2447
 
2457
2448
  /* Variables in libraries */
2458
 
  default_character_set_name= (char*) DRIZZLE_DEFAULT_CHARSET_NAME;
2459
 
  default_collation_name= compiled_default_collation_name;
2460
 
  character_set_filesystem_name= (char*) "binary";
 
2449
  default_character_set_name= "utf8";
 
2450
  default_collation_name= (char *)compiled_default_collation_name;
 
2451
  character_set_filesystem_name= "binary";
2461
2452
  lc_time_names_name= (char*) "en_US";
2462
2453
  /* Set default values for some option variables */
2463
2454
  default_storage_engine_str= (char*) "innodb";