← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/drizzled.cc

  • Committer: Brian Aker
  • Date: 2008-07-14 22:18:37 UTC
  • mfrom: (77.1.96 codestyle)
  • Revision ID: brian@tangent.org-20080714221837-oceoshx7fjkla9u3
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/drizzled.cc
220
220
static bool lower_case_table_names_used= 0;
221
221
static bool volatile select_thread_in_use, signal_thread_in_use;
222
222
static bool volatile ready_to_exit;
223
 
static bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
 
223
static bool opt_debugging= 0, opt_console= 0;
224
224
static bool opt_short_log_format= 0;
225
225
static uint kill_cached_threads, wake_thread;
226
226
static ulong killed_threads, thread_created;
3006
3006
enum options_mysqld
3007
3007
{
3008
3008
  OPT_ISAM_LOG=256,            OPT_SKIP_NEW, 
3009
 
  OPT_SKIP_GRANT,              OPT_SKIP_LOCK, 
 
3009
  OPT_SKIP_GRANT,              
3010
3010
  OPT_ENABLE_LOCK,             OPT_USE_LOCKING,
3011
3011
  OPT_SOCKET,                  OPT_UPDATE_LOG,
3012
3012
  OPT_BIN_LOG,                 
4641
4641
  case (int) OPT_SKIP_PRIOR:
4642
4642
    opt_specialflag|= SPECIAL_NO_PRIOR;
4643
4643
    break;
4644
 
  case (int) OPT_SKIP_LOCK:
4645
 
    opt_external_locking=0;
4646
 
    break;
4647
4644
  case (int) OPT_SKIP_SHOW_DB:
4648
4645
    opt_skip_show_db=1;
4649
4646
    opt_specialflag|=SPECIAL_SKIP_SHOW_DB;
4891
4888
    Set some global variables from the global_system_variables
4892
4889
    In most cases the global variables will not be used
4893
4890
  */
4894
 
  my_disable_locking= myisam_single_user= test((opt_external_locking == 0));
4895
4891
  my_default_record_cache_size=global_system_variables.read_buff_size;
4896
4892
  myisam_max_temp_length=
4897
4893
    (my_off_t) global_system_variables.myisam_max_sort_file_size;