← 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: 2009-04-16 20:12:59 UTC
  • mfrom: (992.1.20 mordred)
  • Revision ID: brian@gaz-20090416201259-2x3czxb5hsdisr6h
Merge Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
18
18
 */
19
19
 
20
20
 
 
21
#include <drizzled/server_includes.h>
21
22
#include <drizzled/configmake.h>
22
 
#include <drizzled/server_includes.h>
23
23
#include <drizzled/atomics.h>
24
24
 
25
25
#include <netdb.h>
222
222
 
223
223
/* static variables */
224
224
 
 
225
extern TYPELIB optimizer_use_mrr_typelib;
 
226
 
225
227
/* the default log output is log tables */
226
228
static bool volatile select_thread_in_use;
227
229
static bool volatile ready_to_exit;
448
450
void close_connections(void)
449
451
{
450
452
  /* Abort listening to new connections */
451
 
  assert(write(abort_pipe[1], "\0", 1) == 1);
 
453
  ssize_t ret= write(abort_pipe[1], "\0", 1);
 
454
  assert(ret);
452
455
 
453
456
  /* kill connection thread */
454
457
  (void) pthread_mutex_lock(&LOCK_thread_count);
796
799
  struct addrinfo *next;
797
800
  struct addrinfo hints;
798
801
  int error;
799
 
  int ip_sock;
 
802
  int ip_sock= -1;
800
803
 
801
804
  set_ports();
802
805
 
2069
2072
  OPT_PORT_OPEN_TIMEOUT,
2070
2073
  OPT_KEEP_FILES_ON_CREATE,
2071
2074
  OPT_SECURE_FILE_PRIV,
2072
 
  OPT_MIN_EXAMINED_ROW_LIMIT
 
2075
  OPT_MIN_EXAMINED_ROW_LIMIT,
 
2076
  OPT_OPTIMIZER_USE_MRR
2073
2077
};
2074
2078
 
2075
2079
 
2440
2444
   (char**) &global_system_variables.optimizer_search_depth,
2441
2445
   (char**) &max_system_variables.optimizer_search_depth,
2442
2446
   0, GET_UINT, OPT_ARG, MAX_TABLES+1, 0, MAX_TABLES+2, 0, 1, 0},
 
2447
  {"optimizer_use_mrr", OPT_OPTIMIZER_USE_MRR,
 
2448
   N_("Should the Optmizer use MRR or not. "
 
2449
      "Valid values are auto, force and disable"),
 
2450
   0, 0, 0, GET_STR, REQUIRED_ARG, 0,
 
2451
   0, 0, 0, 0, 0},
2443
2452
  {"plugin_dir", OPT_PLUGIN_DIR,
2444
2453
   N_("Directory for plugins."),
2445
2454
   (char**) &opt_plugin_dir_ptr, (char**) &opt_plugin_dir_ptr, 0,
2931
2940
      global_system_variables.tx_isolation= (type-1);
2932
2941
      break;
2933
2942
    }
 
2943
  case OPT_OPTIMIZER_USE_MRR:
 
2944
    {
 
2945
      int type;
 
2946
      type= find_type_or_exit(argument, &optimizer_use_mrr_typelib, opt->name);
 
2947
      global_system_variables.optimizer_use_mrr= (type-1);
 
2948
      break;
 
2949
    }
2934
2950
  case OPT_MYISAM_RECOVER:
2935
2951
    {
2936
2952
      if (!argument)