← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Eric Day
  • Date: 2009-10-31 21:53:33 UTC
  • mfrom: (1200 staging)
  • mto: This revision was merged to the branch mainline in revision 1202.
  • Revision ID: eday@oddments.org-20091031215333-j94bjoanwmi68p6f
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
40
40
#include "drizzled/plugin/scheduler.h"
41
41
#include "drizzled/plugin/authentication.h"
42
42
#include "drizzled/probes.h"
 
43
#include "drizzled/table_proto.h"
43
44
 
44
45
#include <algorithm>
45
46
 
199
200
  derived_tables_processing(false),
200
201
  tablespace_op(false),
201
202
  m_lip(NULL),
202
 
  cached_table(0)
 
203
  cached_table(0),
 
204
  transaction_message(NULL),
 
205
  statement_message(NULL)
203
206
{
204
207
  memset(process_list_info, 0, PROCESS_LIST_WIDTH);
205
208
  client->setSession(this);
1962
1965
  pthread_mutex_unlock(&LOCK_status);
1963
1966
}
1964
1967
 
1965
 
#define extra_size sizeof(double)
1966
 
 
1967
1968
user_var_entry *Session::getVariable(LEX_STRING &name, bool create_if_not_exists)
1968
1969
{
1969
1970
  user_var_entry *entry= NULL;
2157
2158
  if (delete_table_proto_file(path))
2158
2159
    error=1;
2159
2160
 
2160
 
  if (base->doDeleteTable(this, path))
 
2161
  if (base->doDropTable(*this, path))
2161
2162
  {
2162
2163
    error=1;
2163
2164
    errmsg_printf(ERRMSG_LVL_WARN, _("Could not remove temporary table: '%s', error: %d"),