← 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: 2008-12-20 21:07:44 UTC
  • mto: (722.2.2 devel)
  • mto: This revision was merged to the branch mainline in revision 727.
  • Revision ID: monty@inaugust.com-20081220210744-bhmvkzh2qspp9nxt
Cleaned up a few build things.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
220
220
 
221
221
const char *first_keyword= "first", *binary_keyword= "BINARY";
222
222
const char *my_localhost= "localhost";
 
223
const char * const DRIZZLE_CONFIG_NAME= "drizzled";
223
224
#define GET_HA_ROWS GET_ULL
224
225
 
225
226
/*
302
303
#endif
303
304
uint32_t drizzled_port, test_flags, select_errors, dropping_tables, ha_open_options;
304
305
uint32_t drizzled_port_timeout;
305
 
uint32_t delay_key_write_options, protocol_version;
 
306
uint32_t delay_key_write_options, protocol_version= PROTOCOL_VERSION;
306
307
uint32_t lower_case_table_names= 1;
307
308
uint32_t tc_heuristic_recover= 0;
308
309
uint32_t volatile thread_count, thread_running;
1720
1721
 
1721
1722
 
1722
1723
static const char *load_default_groups[]= {
1723
 
"drizzled","server", DRIZZLE_BASE_VERSION, 0, 0};
 
1724
DRIZZLE_CONFIG_NAME,"server", DRIZZLE_BASE_VERSION, 0, 0};
1724
1725
 
1725
1726
 
1726
1727
/**
3942
3943
  drizzle_data_home= drizzle_real_data_home;
3943
3944
  session_startup_options= (OPTION_AUTO_IS_NULL | OPTION_BIN_LOG |
3944
3945
                        OPTION_QUOTE_SHOW_CREATE | OPTION_SQL_NOTES);
3945
 
  protocol_version= PROTOCOL_VERSION;
3946
3946
  what_to_log= ~ (1L << (uint) COM_TIME);
3947
3947
  refresh_version= 1L;  /* Increments on each reload */
3948
3948
  thread_id= 1;