← 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: 2009-01-30 07:03:19 UTC
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 823.
  • Revision ID: mordred@inaugust.com-20090130070319-ubkdm54mm7u7vk7z
More fixy-fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
465
465
 
466
466
/* Function declarations */
467
467
 
468
 
pthread_handler_t signal_hand(void *arg);
 
468
extern "C" pthread_handler_t signal_hand(void *arg);
469
469
static void drizzle_init_variables(void);
470
470
static void get_options(int *argc,char **argv);
471
471
extern "C" bool drizzled_get_one_option(int, const struct my_option *, char *);
474
474
static const char *get_relative_path(const char *path);
475
475
static void fix_paths(void);
476
476
void handle_connections_sockets();
477
 
pthread_handler_t kill_server_thread(void *arg);
478
 
pthread_handler_t handle_slave(void *arg);
 
477
extern "C" pthread_handler_t kill_server_thread(void *arg);
 
478
extern "C" pthread_handler_t handle_slave(void *arg);
479
479
static uint32_t find_bit_type(const char *x, TYPELIB *bit_lib);
480
480
static uint32_t find_bit_type_or_exit(const char *x, TYPELIB *bit_lib,
481
481
                                   const char *option);
488
488
static void wait_for_signal_thread_to_end(void);
489
489
static void create_pid_file();
490
490
static void drizzled_exit(int exit_code) __attribute__((noreturn));
491
 
bool safe_read_error_impl(NET *net);
 
491
extern "C" bool safe_read_error_impl(NET *net);
492
492
 
493
493
/****************************************************************************
494
494
** Code to end drizzled
1597
1597
#endif
1598
1598
      break;                                    /* purecov: tested */
1599
1599
    }
 
1600
  return 0;
1600
1601
  }
1601
 
  return(0);                                    /* purecov: deadcode */
1602
1602
}
1603
1603
 
1604
1604
static void check_data_home(const char *)
1836
1836
 
1837
1837
  /* connections and databases needs lots of files */
1838
1838
  {
1839
 
    uint32_t files, wanted_files, max_open_files;
 
1839
    uint64_t files, wanted_files, max_open_files;
1840
1840
 
1841
1841
    /* MyISAM requires two file handles per table. */
1842
1842
    wanted_files= 10+max_connections+table_cache_size*2;
3381
3381
  abort_loop= select_thread_in_use= signal_thread_in_use= 0;
3382
3382
  ready_to_exit= shutdown_in_progress= 0;
3383
3383
  aborted_threads= aborted_connects= 0;
3384
 
  max_used_connections= slow_launch_threads = 0;
 
3384
  max_used_connections= 0;
 
3385
  slow_launch_threads= 0;
3385
3386
  drizzled_user= drizzled_chroot= opt_init_file= opt_bin_logname = 0;
3386
3387
  my_bind_addr_str= NULL;
3387
3388
  memset(&global_status_var, 0, sizeof(global_status_var));