← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Mark Atwood
  • Date: 2011-10-19 00:10:47 UTC
  • mfrom: (2440.2.13 rf)
  • Revision ID: me@mark.atwood.name-20111019001047-atj0u8gedphon1tb
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
174
174
  util::string::ptr schema(session->schema());
175
175
  if (ident)
176
176
  {
177
 
    identifier::Schema identifier(ident);
 
177
    identifier::Schema identifier= str_ref(ident);
178
178
    column_name.append(ident);
179
 
    session->lex().select_lex.db= const_cast<char *>(ident);
 
179
    session->lex().select_lex.db= ident;
180
180
    if (not plugin::StorageEngine::doesSchemaExist(identifier))
181
181
    {
182
182
      my_error(ER_BAD_DB_ERROR, identifier);
240
240
  {
241
241
    session->lex().select_lex.db= const_cast<char *>(ident);
242
242
 
243
 
    identifier::Schema identifier(ident);
 
243
    identifier::Schema identifier= str_ref(ident);
244
244
    if (not plugin::StorageEngine::doesSchemaExist(identifier))
245
245
    {
246
246
      my_error(ER_BAD_DB_ERROR, identifier);