← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge Joe's scheduler fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
218
218
bool volatile select_thread_in_use;
219
219
bool volatile abort_loop;
220
220
bool volatile shutdown_in_progress;
221
 
const string opt_scheduler_default("multi_thread");
 
221
char *opt_scheduler_default;
222
222
char *opt_scheduler= NULL;
223
223
 
224
224
size_t my_thread_stack_size= 65536;
995
995
  else
996
996
  {
997
997
    scheduler_name= opt_scheduler_default;
 
998
    opt_scheduler= opt_scheduler_default; 
998
999
  }
999
1000
 
1000
1001
  if (plugin::Scheduler::setPlugin(scheduler_name))
1554
1555
  max_system_variables.select_limit=    (uint64_t) HA_POS_ERROR;
1555
1556
  global_system_variables.max_join_size= (uint64_t) HA_POS_ERROR;
1556
1557
  max_system_variables.max_join_size=   (uint64_t) HA_POS_ERROR;
 
1558
  opt_scheduler_default= (char*) "multi_thread";
1557
1559
 
1558
1560
  /* Variables that depends on compile options */
1559
1561
#ifdef HAVE_BROKEN_REALPATH