← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: devananda
  • Date: 2009-06-30 14:27:54 UTC
  • mfrom: (1030.2.4 trunk)
  • mto: (1093.1.7 captain)
  • mto: This revision was merged to the branch mainline in revision 1095.
  • Revision ID: devananda.vdv@gmail.com-20090630142754-vm9w374yxkf1pikc
merge from lp

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
45
45
#include <drizzled/transaction_services.h>
46
46
#include <drizzled/check_stack_overrun.h>
47
47
#include <drizzled/lock.h>
 
48
#include <drizzled/listen.h>
48
49
 
49
50
extern drizzled::TransactionServices transaction_services;
50
51
 
2387
2388
                                          HA_TRY_READ_ONLY),
2388
2389
                              EXTRA_RECORD,
2389
2390
                              ha_open_options | HA_OPEN_FOR_REPAIR,
2390
 
                              entry, OTM_OPEN) || ! entry->file ||
2391
 
        (entry->file->is_crashed() && entry->file->ha_check_and_repair(session)))
 
2391
                              entry, OTM_OPEN) || ! entry->file)
2392
2392
    {
2393
2393
      /* Give right error message */
2394
2394
      session->clear_error();
4993
4993
}
4994
4994
 
4995
4995
 
4996
 
bool drizzle_rm_tmp_tables(void)
 
4996
bool drizzle_rm_tmp_tables(ListenHandler &listen_handler)
4997
4997
{
4998
4998
  uint32_t  idx;
4999
4999
  char  filePath[FN_REFLEN], filePathCopy[FN_REFLEN];
5003
5003
 
5004
5004
  assert(drizzle_tmpdir);
5005
5005
 
5006
 
  if (!(session= new Session(get_protocol())))
 
5006
  if (!(session= new Session(listen_handler.getTmpProtocol())))
5007
5007
    return true;
5008
5008
  session->thread_stack= (char*) &session;
5009
5009
  session->store_globals();