← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2009-07-09 00:46:46 UTC
  • mto: (1093.1.9 captain)
  • mto: This revision was merged to the branch mainline in revision 1097.
  • Revision ID: mordred@inaugust.com-20090709004646-zmkgkaaqkdwk0w69
pandora-build v0.8
Removed leftover charset bits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
232
232
static uint32_t killed_threads;
233
233
static char *drizzled_user, *drizzled_chroot;
234
234
static char *language_ptr;
235
 
static char *default_character_set_name;
236
 
static char *character_set_filesystem_name;
 
235
static const char *default_character_set_name;
 
236
static const char *character_set_filesystem_name;
237
237
static char *lc_time_names_name;
238
238
static char *my_bind_addr_str;
239
239
static char *default_collation_name;
240
240
static char *default_storage_engine_str;
241
 
static char compiled_default_collation_name[]= DRIZZLE_DEFAULT_COLLATION_NAME;
 
241
static const char *compiled_default_collation_name= "utf8_general_ci";
242
242
 
243
243
/* Global variables */
244
244
 
1808
1808
  {"bind-address", OPT_BIND_ADDRESS, N_("IP address to bind to."),
1809
1809
   (char**) &my_bind_addr_str, (char**) &my_bind_addr_str, 0, GET_STR,
1810
1810
   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1811
 
  {"character-set-filesystem", OPT_CHARACTER_SET_FILESYSTEM,
1812
 
   N_("Set the filesystem character set."),
1813
 
   (char**) &character_set_filesystem_name,
1814
 
   (char**) &character_set_filesystem_name,
1815
 
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
1816
 
  {"character-set-server", 'C',
1817
 
   N_("Set the default character set."),
1818
 
   (char**) &default_character_set_name, (char**) &default_character_set_name,
1819
 
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
1820
1811
  {"chroot", 'r',
1821
1812
   N_("Chroot drizzled daemon during startup."),
1822
1813
   (char**) &drizzled_chroot, (char**) &drizzled_chroot, 0, GET_STR, REQUIRED_ARG,
2444
2435
  drizzle_data_home_len= 2;
2445
2436
 
2446
2437
  /* Variables in libraries */
2447
 
  default_character_set_name= (char*) DRIZZLE_DEFAULT_CHARSET_NAME;
2448
 
  default_collation_name= compiled_default_collation_name;
2449
 
  character_set_filesystem_name= (char*) "binary";
 
2438
  default_character_set_name= "utf8";
 
2439
  default_collation_name= (char *)compiled_default_collation_name;
 
2440
  character_set_filesystem_name= "binary";
2450
2441
  lc_time_names_name= (char*) "en_US";
2451
2442
  /* Set default values for some option variables */
2452
2443
  default_storage_engine_str= (char*) "innodb";