← 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-07-28 23:44:32 UTC
  • mfrom: (1100.1.6 merge)
  • Revision ID: brian@gaz-20090728234432-t5hpryg40a4rz20b
Removal of all basic MRR

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
215
215
 
216
216
/* static variables */
217
217
 
218
 
extern TYPELIB optimizer_use_mrr_typelib;
219
 
 
220
218
static bool volatile select_thread_in_use;
221
219
static bool volatile ready_to_exit;
222
220
static bool opt_debugging= 0;
1291
1289
  /* Set collactions that depends on the default collation */
1292
1290
  global_system_variables.collation_server=      default_charset_info;
1293
1291
 
1294
 
  global_system_variables.optimizer_use_mrr= 1;
1295
1292
  global_system_variables.optimizer_switch= 0;
1296
1293
 
1297
1294
  if (!(character_set_filesystem=
1750
1747
  OPT_PLUGIN_DIR,
1751
1748
  OPT_PORT_OPEN_TIMEOUT,
1752
1749
  OPT_SECURE_FILE_PRIV,
1753
 
  OPT_MIN_EXAMINED_ROW_LIMIT,
1754
 
  OPT_OPTIMIZER_USE_MRR
 
1750
  OPT_MIN_EXAMINED_ROW_LIMIT
1755
1751
};
1756
1752
 
1757
1753
 
2080
2076
   (char**) &global_system_variables.optimizer_search_depth,
2081
2077
   (char**) &max_system_variables.optimizer_search_depth,
2082
2078
   0, GET_UINT, OPT_ARG, MAX_TABLES+1, 0, MAX_TABLES+2, 0, 1, 0},
2083
 
  {"optimizer_use_mrr", OPT_OPTIMIZER_USE_MRR,
2084
 
   N_("Should the Optmizer use MRR or not. "
2085
 
      "Valid values are auto, force and disable"),
2086
 
   0, 0, 0, GET_STR, REQUIRED_ARG, 0,
2087
 
   0, 0, 0, 0, 0},
2088
2079
  {"plugin_dir", OPT_PLUGIN_DIR,
2089
2080
   N_("Directory for plugins."),
2090
2081
   (char**) &opt_plugin_dir_ptr, (char**) &opt_plugin_dir_ptr, 0,
2552
2543
      global_system_variables.tx_isolation= (type-1);
2553
2544
      break;
2554
2545
    }
2555
 
  case OPT_OPTIMIZER_USE_MRR:
2556
 
    {
2557
 
      int type;
2558
 
      type= find_type_or_exit(argument, &optimizer_use_mrr_typelib, opt->name);
2559
 
      global_system_variables.optimizer_use_mrr= (type-1);
2560
 
      break;
2561
 
    }
2562
2546
  case OPT_TC_HEURISTIC_RECOVER:
2563
2547
    tc_heuristic_recover= find_type_or_exit(argument,
2564
2548
                                            &tc_heuristic_recover_typelib,