← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2010-12-08 18:53:46 UTC
  • mto: This revision was merged to the branch mainline in revision 1983.
  • Revision ID: brian@tangent.org-20101208185346-89uak2ofyivk1yss
Update schema, make sure that it always ruturns a valid string (it just
makes the entire interface simpler to use).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
222
222
      break;                                    // fatal error is set
223
223
    DRIZZLE_QUERY_START(session->getQueryString()->c_str(),
224
224
                        session->thread_id,
225
 
                        const_cast<const char *>(session->schema()->empty() ? "" : session->schema()->c_str()));
 
225
                        const_cast<const char *>(session->schema()->c_str()));
226
226
 
227
227
    mysql_parse(session, session->getQueryString()->c_str(), session->getQueryString()->length());
228
228
 
743
743
      {
744
744
        DRIZZLE_QUERY_EXEC_START(session->getQueryString()->c_str(),
745
745
                                 session->thread_id,
746
 
                                 const_cast<const char *>(session->schema()->empty() ? "" : session->schema()->c_str()));
 
746
                                 const_cast<const char *>(session->schema()->c_str()));
747
747
        // Implement Views here --Brian
748
748
        /* Actually execute the query */
749
749
        try