← Back to branch summary

~posulliv/drizzle/memcached_applier

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1144
1144
  {"create_index",         (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_CREATE_INDEX]), SHOW_LONG_STATUS},
1145
1145
  {"create_table",         (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_CREATE_TABLE]), SHOW_LONG_STATUS},
1146
1146
  {"delete",               (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_DELETE]), SHOW_LONG_STATUS},
1147
 
  {"delete_multi",         (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_DELETE_MULTI]), SHOW_LONG_STATUS},
1148
1147
  {"drop_db",              (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_DROP_DB]), SHOW_LONG_STATUS},
1149
1148
  {"drop_index",           (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_DROP_INDEX]), SHOW_LONG_STATUS},
1150
1149
  {"drop_table",           (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_DROP_TABLE]), SHOW_LONG_STATUS},
1181
1180
  {"truncate",             (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_TRUNCATE]), SHOW_LONG_STATUS},
1182
1181
  {"unlock_tables",        (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_UNLOCK_TABLES]), SHOW_LONG_STATUS},
1183
1182
  {"update",               (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_UPDATE]), SHOW_LONG_STATUS},
1184
 
  {"update_multi",         (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_UPDATE_MULTI]), SHOW_LONG_STATUS},
1185
1183
  {NULL, NULL, SHOW_LONGLONG}
1186
1184
};
1187
1185
 
1684
1682
  OPT_MEMLOCK,
1685
1683
  OPT_SERVER_ID,
1686
1684
  OPT_TC_HEURISTIC_RECOVER,
1687
 
  OPT_ENGINE_CONDITION_PUSHDOWN,
1688
1685
  OPT_TEMP_POOL, OPT_TX_ISOLATION, OPT_COMPLETION_TYPE,
1689
1686
  OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS,
1690
1687
  OPT_DO_PSTACK,
1806
1803
   (char**) &opt_do_pstack, (char**) &opt_do_pstack, 0, GET_BOOL, NO_ARG, 0, 0,
1807
1804
   0, 0, 0, 0},
1808
1805
#endif /* HAVE_STACK_TRACE_ON_SEGV */
1809
 
  {"engine-condition-pushdown",
1810
 
   OPT_ENGINE_CONDITION_PUSHDOWN,
1811
 
   N_("Push supported query conditions to the storage engine."),
1812
 
   (char**) &global_system_variables.engine_condition_pushdown,
1813
 
   (char**) &global_system_variables.engine_condition_pushdown,
1814
 
   0, GET_BOOL, NO_ARG, false, 0, 0, 0, 0, 0},
1815
1806
  /* See how it's handled in get_one_option() */
1816
1807
  {"exit-info", 'T',
1817
1808
   N_("Used for debugging;  Use at your own risk!"),