← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Stewart Smith
  • Date: 2009-03-12 22:50:41 UTC
  • mfrom: (933 drizzle)
  • mto: (937.2.1 sparc)
  • mto: This revision was merged to the branch mainline in revision 936.
  • Revision ID: stewart@flamingspork.com-20090312225041-o646q9jhwlxttuia
merge mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
248
248
/* Global variables */
249
249
 
250
250
bool opt_bin_log;
251
 
bool opt_log_queries_not_using_indexes= false;
252
251
bool opt_skip_show_db= false;
253
252
bool server_id_supplied = 0;
254
253
bool opt_endinfo, using_udf_functions;
256
255
bool opt_using_transactions;
257
256
bool volatile abort_loop;
258
257
bool volatile shutdown_in_progress;
259
 
bool opt_skip_slave_start = 0; ///< If set, slave is not autostarted
260
 
bool opt_reckless_slave = 0;
261
 
bool opt_enable_named_pipe= 0;
262
258
bool opt_local_infile;
263
 
bool opt_safe_user_create = 0;
264
 
bool opt_show_slave_auth_info, opt_sql_bin_update = 0;
265
 
bool opt_log_slave_updates= 0;
266
259
uint32_t max_used_connections;
267
 
const char *opt_scheduler= "pool_of_threads";
 
260
const char *opt_scheduler= "multi_thread";
268
261
 
269
262
size_t my_thread_stack_size= 65536;
270
263
 
411
404
pthread_rwlock_t        LOCK_system_variables_hash;
412
405
pthread_cond_t COND_refresh, COND_thread_count, COND_global_read_lock;
413
406
pthread_t signal_thread;
414
 
pthread_attr_t connection_attrib;
415
407
pthread_cond_t  COND_server_started;
416
408
 
417
409
/* replication parameters, if master_host is not NULL, we are a slave */
1563
1555
  (void) pthread_cond_init(&COND_refresh,NULL);
1564
1556
  (void) pthread_cond_init(&COND_global_read_lock,NULL);
1565
1557
 
1566
 
  /* Parameter for threads created for connections */
1567
 
  (void) pthread_attr_init(&connection_attrib);
1568
 
  (void) pthread_attr_setdetachstate(&connection_attrib,
1569
 
                                     PTHREAD_CREATE_DETACHED);
1570
 
  pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM);
1571
 
  {
1572
 
    struct sched_param tmp_sched_param;
1573
 
 
1574
 
    memset(&tmp_sched_param, 0, sizeof(tmp_sched_param));
1575
 
    tmp_sched_param.sched_priority= WAIT_PRIOR;
1576
 
    (void)pthread_attr_setschedparam(&connection_attrib, &tmp_sched_param);
1577
 
  }
1578
 
 
1579
1558
  if (pthread_key_create(&THR_Session,NULL) ||
1580
1559
      pthread_key_create(&THR_Mem_root,NULL))
1581
1560
  {
1768
1747
 
1769
1748
  init_signals();
1770
1749
 
 
1750
#ifdef TODO_MOVE_OUT_TO_SCHEDULER_API
1771
1751
  pthread_attr_setstacksize(&connection_attrib, my_thread_stack_size);
1772
1752
 
1773
1753
#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
1789
1769
    }
1790
1770
  }
1791
1771
#endif
 
1772
#endif
1792
1773
 
1793
1774
  select_thread=pthread_self();
1794
1775
  select_thread_in_use=1;
2820
2801
static void drizzle_init_variables(void)
2821
2802
{
2822
2803
  /* Things reset to zero */
2823
 
  opt_skip_slave_start= opt_reckless_slave = 0;
2824
2804
  drizzle_home[0]= pidfile_name[0]= 0;
2825
2805
  opt_bin_log= 0;
2826
2806
  opt_skip_show_db=0;