← 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-04-13 18:54:56 UTC
  • mfrom: (2275.1.2 build)
  • Revision ID: kalebral@gmail.com-20110413185456-ygv8a7lxf92ttoee
Merge Joe - 755201: slave plugin queryForReplicationEvents() query needs to be ordered
Merge Olaf - Refactor Session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
185
185
 
186
186
  std::string column_name= "Tables_in_";
187
187
 
188
 
  util::string::const_shared_ptr schema(session->schema());
 
188
  util::string::ptr schema(session->schema());
189
189
  if (ident)
190
190
  {
191
191
    identifier::Schema identifier(ident);
258
258
 
259
259
  std::string column_name= "Tables_in_";
260
260
 
261
 
  util::string::const_shared_ptr schema(session->schema());
 
261
  util::string::ptr schema(session->schema());
262
262
  if (ident)
263
263
  {
264
264
    session->lex().select_lex.db= const_cast<char *>(ident);
309
309
  drizzled::statement::Show *select= new statement::Show(session);
310
310
  session->lex().statement= select;
311
311
 
312
 
  util::string::const_shared_ptr schema(session->schema());
 
312
  util::string::ptr schema(session->schema());
313
313
  if (schema_ident)
314
314
  {
315
315
    select->setShowPredicate(schema_ident, table_ident->table.str);
375
375
  drizzled::statement::Show *select= new statement::Show(session);
376
376
  session->lex().statement= select;
377
377
 
378
 
  util::string::const_shared_ptr schema(session->schema());
 
378
  util::string::ptr schema(session->schema());
379
379
  if (schema_ident)
380
380
  {
381
381
    select->setShowPredicate(schema_ident, table_ident->table.str);
461
461
  if (prepare_new_schema_table(session, session->lex(), "TABLE_SQL_DEFINITION"))
462
462
    return false;
463
463
 
464
 
  util::string::const_shared_ptr schema(session->schema());
 
464
  util::string::ptr schema(session->schema());
465
465
  if (ident->db.str)
466
466
  {
467
467
    select->setShowPredicate(ident->db.str, ident->table.str);
557
557
  if (prepare_new_schema_table(session, session->lex(), "SCHEMA_SQL_DEFINITION"))
558
558
    return false;
559
559
 
560
 
  util::string::const_shared_ptr schema(session->schema());
 
560
  util::string::ptr schema(session->schema());
561
561
  if (ident.str)
562
562
  {
563
563
    select->setShowPredicate(ident.str);
602
602
  session->lex().statement= select;
603
603
  session->lex().select_lex.db= 0;
604
604
 
605
 
  util::string::const_shared_ptr schema(session->schema());
 
605
  util::string::ptr schema(session->schema());
606
606
  if (ident->db.str)
607
607
  {
608
608
    select->setShowPredicate(ident->db.str, ident->table.str);