← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Lee Bieber
  • Date: 2011-02-01 00:45:23 UTC
  • mfrom: (2131.2.4 build)
  • Revision ID: kalebral@gmail.com-20110201004523-4li8i1mvawn0ebz4
Merge Patrick - 710942: dbqp not recovering from certain tests with non-started servers
Merge Patrick - 709861: dbqp not running on mac osx
Merge Andrew - 702582: SHOW INNODB STATUS should error
Merge Monty - Remove a leftover warning from a previous attempt at fixing the OSX issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
305
305
  return true;
306
306
}
307
307
 
 
308
bool buildEngineStatus(Session *session, LEX_STRING)
 
309
{
 
310
  session->getLex()->sql_command= SQLCOM_SELECT;
 
311
  drizzled::statement::Show *select= new statement::Show(session);
 
312
  session->getLex()->statement= select;
 
313
 
 
314
  my_error(ER_USE_DATA_DICTIONARY);
 
315
  return false;
 
316
}
 
317
 
308
318
bool buildColumns(Session *session, const char *schema_ident, Table_ident *table_ident)
309
319
{
310
320
  session->getLex()->sql_command= SQLCOM_SELECT;