← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Mark Atwood
  • Date: 2011-06-14 19:30:31 UTC
  • mfrom: (2318.2.41 refactor5)
  • Revision ID: me@mark.atwood.name-20110614193031-lwbrlwfgf6id4r8b
merge lp:~olafvdspek/drizzle/refactor6
 with resolved conflict in drizzled/plugin/client.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
220
220
 
221
221
static bool opt_debugging= false;
222
222
static uint32_t wake_thread;
223
 
static const char *drizzled_chroot;
224
 
static const char *default_character_set_name;
225
 
static const char *character_set_filesystem_name;
226
 
static const char *lc_time_names_name;
227
 
static const char *default_collation_name;
228
 
static const char *default_storage_engine_str;
229
 
static const char *compiled_default_collation_name= "utf8_general_ci";
 
223
static const char* drizzled_chroot;
 
224
static const char* default_character_set_name= "utf8";
 
225
static const char* character_set_filesystem_name= "binary";
 
226
static const char* lc_time_names_name= "en_US";
 
227
static const char* default_storage_engine_str= "innodb";
 
228
static const char* const compiled_default_collation_name= "utf8_general_ci";
 
229
static const char* default_collation_name= compiled_default_collation_name;
230
230
 
231
231
/* Global variables */
232
232
 
353
353
 
354
354
DRIZZLED_API size_t transaction_message_threshold;
355
355
 
356
 
static void drizzle_init_variables(void);
 
356
static void drizzle_init_variables();
357
357
static void get_options();
358
358
static void fix_paths();
359
359
 
360
 
static void usage(void);
361
 
void close_connections(void);
 
360
static void usage();
 
361
void close_connections();
362
362
 
363
363
fs::path base_plugin_dir(PKGPLUGINDIR);
364
364
 
400
400
** Code to end drizzled
401
401
****************************************************************************/
402
402
 
403
 
void close_connections(void)
 
403
void close_connections()
404
404
{
405
405
  /* Abort listening to new connections */
406
406
  plugin::Listen::shutdown();
1939
1939
  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
1940
1940
};
1941
1941
 
1942
 
static void print_version(void)
 
1942
static void print_version()
1943
1943
{
1944
1944
  /*
1945
1945
    Note: the instance manager keys off the string 'Ver' so it can find the
1946
1946
    version from the output of 'drizzled --version', so don't change it!
1947
1947
  */
1948
 
  printf("%s  Ver %s for %s-%s on %s (%s)\n",internal::my_progname,
1949
 
         PANDORA_RELEASE_VERSION, HOST_VENDOR, HOST_OS, HOST_CPU,
1950
 
         COMPILATION_COMMENT);
 
1948
  printf("%s  Ver %s for %s-%s on %s (%s)\n", internal::my_progname,
 
1949
         PANDORA_RELEASE_VERSION, HOST_VENDOR, HOST_OS, HOST_CPU, COMPILATION_COMMENT);
1951
1950
}
1952
1951
 
1953
 
static void usage(void)
 
1952
static void usage()
1954
1953
{
1955
1954
  if (!(default_charset_info= get_charset_by_csname(default_character_set_name, MY_CS_PRIMARY)))
1956
1955
    exit(1);
1957
1956
  if (!default_collation_name)
1958
 
    default_collation_name= (char*) default_charset_info->name;
 
1957
    default_collation_name= default_charset_info->name;
1959
1958
  print_version();
1960
1959
  puts(_("Copyright (C) 2008 Sun Microsystems\n"
1961
1960
         "This software comes with ABSOLUTELY NO WARRANTY. "
1991
1990
    as these are initialized by my_getopt.
1992
1991
*/
1993
1992
 
1994
 
static void drizzle_init_variables(void)
 
1993
static void drizzle_init_variables()
1995
1994
{
1996
1995
  /* Things reset to zero */
1997
1996
  opt_tc_log_file= (char *)"tc.log";      // no hostname in tc_log file name !
2013
2012
 
2014
2013
  /* Things with default values that are not zero */
2015
2014
  session_startup_options= (OPTION_AUTO_IS_NULL | OPTION_SQL_NOTES);
2016
 
  g_refresh_version= 1L;        /* Increments on each reload */
2017
 
  global_thread_id= 1UL;
 
2015
  global_thread_id= 1;
2018
2016
  session::Cache::getCache().clear();
2019
2017
 
2020
 
  /* Variables in libraries */
2021
 
  default_character_set_name= "utf8";
2022
 
  default_collation_name= (char *)compiled_default_collation_name;
2023
 
  character_set_filesystem_name= "binary";
2024
 
  lc_time_names_name= (char*) "en_US";
2025
2018
  /* Set default values for some option variables */
2026
 
  default_storage_engine_str= (char*) "innodb";
2027
2019
  global_system_variables.storage_engine= NULL;
2028
2020
  global_system_variables.tx_isolation= ISO_REPEATABLE_READ;
2029
2021
  global_system_variables.select_limit= (uint64_t) HA_POS_ERROR;