← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Lee Bieber
  • Date: 2011-04-14 19:29:43 UTC
  • mfrom: (2278.1.2 build)
  • Revision ID: kalebral@gmail.com-20110414192943-q1nxcdqupal0anjb
Merge Olaf - Refactor Table Cache
Merge Olaf - Delete unused functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
226
226
      my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
227
227
      break;
228
228
    }
229
 
 
230
 
    string tmp(packet, packet_length);
231
 
 
232
 
    identifier::Schema identifier(tmp);
233
 
 
234
 
    if (not schema::change(*session, identifier))
 
229
    if (not schema::change(*session, identifier::Schema(string(packet, packet_length))))
235
230
    {
236
231
      session->my_ok();
237
232
    }
239
234
  }
240
235
  case COM_QUERY:
241
236
  {
242
 
    if (not session->readAndStoreQuery(packet, packet_length))
243
 
      break;                                    // fatal error is set
244
 
    DRIZZLE_QUERY_START(session->getQueryString()->c_str(),
245
 
                        session->thread_id,
246
 
                        const_cast<const char *>(session->schema()->c_str()));
247
 
 
 
237
    session->readAndStoreQuery(packet, packet_length);
 
238
    DRIZZLE_QUERY_START(session->getQueryString()->c_str(), session->thread_id, session->schema()->c_str());
248
239
    parse(*session, session->getQueryString()->c_str(), session->getQueryString()->length());
249
 
 
250
240
    break;
251
241
  }
252
242
  case COM_QUIT: