← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Monty Taylor
  • Date: 2008-10-09 18:48:17 UTC
  • mfrom: (496 drizzle)
  • mto: This revision was merged to the branch mainline in revision 497.
  • Revision ID: monty@inaugust.com-20081009184817-s7iu11gj7m96y2v6
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
183
183
  sql_command_flags[SQLCOM_SHOW_FIELDS]=      CF_STATUS_COMMAND;
184
184
  sql_command_flags[SQLCOM_SHOW_KEYS]=        CF_STATUS_COMMAND;
185
185
  sql_command_flags[SQLCOM_SHOW_VARIABLES]=   CF_STATUS_COMMAND;
186
 
  sql_command_flags[SQLCOM_SHOW_CHARSETS]=    CF_STATUS_COMMAND;
187
 
  sql_command_flags[SQLCOM_SHOW_COLLATIONS]=  CF_STATUS_COMMAND;
188
186
  sql_command_flags[SQLCOM_SHOW_BINLOGS]= CF_STATUS_COMMAND;
189
 
  sql_command_flags[SQLCOM_SHOW_BINLOG_EVENTS]= CF_STATUS_COMMAND;
190
187
  sql_command_flags[SQLCOM_SHOW_WARNS]= CF_STATUS_COMMAND;
191
188
  sql_command_flags[SQLCOM_SHOW_ERRORS]= CF_STATUS_COMMAND;
192
189
  sql_command_flags[SQLCOM_SHOW_ENGINE_STATUS]= CF_STATUS_COMMAND;
1203
1200
  case SQLCOM_SHOW_FIELDS:
1204
1201
  case SQLCOM_SHOW_KEYS:
1205
1202
  case SQLCOM_SHOW_VARIABLES:
1206
 
  case SQLCOM_SHOW_CHARSETS:
1207
 
  case SQLCOM_SHOW_COLLATIONS:
1208
1203
  case SQLCOM_SELECT:
1209
1204
  {
1210
1205
    thd->status_var.last_query_cost= 0.0;
1256
1251
                              (1L << (uint32_t) DRIZZLE_ERROR::WARN_LEVEL_ERROR));
1257
1252
    break;
1258
1253
  }
1259
 
  case SQLCOM_SHOW_BINLOG_EVENTS:
1260
 
  {
1261
 
    res = mysql_show_binlog_events(thd);
1262
 
    break;
1263
 
  }
1264
 
 
1265
1254
  case SQLCOM_ASSIGN_TO_KEYCACHE:
1266
1255
  {
1267
1256
    assert(first_table == all_tables && first_table != 0);