← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2008-11-29 20:14:39 UTC
  • mfrom: (629.2.8 devel)
  • Revision ID: brian@tangent.org-20081129201439-mi0x46vwo2kdd406
Merge of Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
277
277
static struct pollfd fds[UINT8_MAX];
278
278
static uint8_t pollfd_count= 0;
279
279
 
 
280
size_t my_thread_stack_size= 65536;
 
281
 
280
282
/*
281
283
  Legacy global handlerton. These will be removed (please do not add more).
282
284
*/
2375
2377
    {
2376
2378
      if (global_system_variables.log_warnings)
2377
2379
      {
2378
 
        /* %zu is not yet in C++ */
2379
 
        uint64_t size_tmp= (uint64_t)stack_size;
2380
 
        sql_print_warning(_("Asked for %u thread stack, but got %"PRIu64),
2381
 
                          my_thread_stack_size, size_tmp);
 
2380
        sql_print_warning(_("Asked for %"PRIu64" thread stack, "
 
2381
                            "but got %"PRIu64),
 
2382
                          (uint64_t)my_thread_stack_size,
 
2383
                          (uint64_t)stack_size);
2382
2384
      }
2383
2385
      my_thread_stack_size= stack_size;
2384
2386
    }
2466
2468
 
2467
2469
 
2468
2470
  handle_connections_sockets();
2469
 
 
2470
2471
  /* (void) pthread_attr_destroy(&connection_attrib); */
2471
2472
 
2472
2473
 
3591
3592
  {"thread_stack", OPT_THREAD_STACK,
3592
3593
   N_("The stack size for each thread."),
3593
3594
   (char**) &my_thread_stack_size,
3594
 
   (char**) &my_thread_stack_size, 0, GET_ULL,
 
3595
   (char**) &my_thread_stack_size, 0, GET_ULONG,
3595
3596
   REQUIRED_ARG,DEFAULT_THREAD_STACK,
3596
 
   1024L*128L, ULONG_MAX, 0, 1024, 0},
 
3597
   UINT32_C(1024*128), SIZE_MAX, 0, 1024, 0},
3597
3598
  { "time_format", OPT_TIME_FORMAT,
3598
3599
    N_("The TIME format (for future)."),
3599
3600
    (char**) &opt_date_time_formats[DRIZZLE_TIMESTAMP_TIME],