← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/execute.cc

  • Committer: Lee Bieber
  • Date: 2010-11-18 15:33:33 UTC
  • mfrom: (1932.3.14 trunk)
  • Revision ID: kalebral@gmail.com-20101118153333-1onwy3lvwmxltqdn
Merge Brian - more session work and clean up

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/execute.cc
105
105
      plugin::client::Concurrent *client= new plugin::client::Concurrent;
106
106
      std::string execution_string(to_execute.str, to_execute.length);
107
107
      client->pushSQL(execution_string);
108
 
      Session *new_session= new Session(client);
 
108
      Session::shared_ptr new_session(new Session(client));
109
109
 
110
110
      // We set the current schema.  @todo do the same with catalog
111
111
      if (not getSession()->getSchema().empty())
118
118
      // user.
119
119
      new_session->getSecurityContext()= getSession()->getSecurityContext();
120
120
 
121
 
      if (new_session->schedule())
 
121
      if (Session::schedule(new_session))
122
122
        Session::unlink(new_session);
123
123
    }
124
124
    else