← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Lee Bieber
  • Date: 2011-03-23 01:55:35 UTC
  • mfrom: (2245.1.2 build)
  • Revision ID: kalebral@gmail.com-20110323015535-2aatqy8tyiuqtc2z
Merge Olaf - more code refactoring

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
60
60
#include <drizzled/session.h>
61
61
#include <drizzled/item/subselect.h>
62
62
#include <drizzled/sql_lex.h>
63
 
 
64
63
#include <drizzled/refresh_version.h>
 
64
#include <drizzled/catalog/local.h>
65
65
 
66
66
using namespace std;
67
67
 
68
 
namespace drizzled
69
 
{
 
68
namespace drizzled {
70
69
 
71
70
extern bool volatile shutdown_in_progress;
72
71
 
979
978
    }
980
979
 
981
980
    /*
982
 
      Before we test the global cache, we test our local session cache.
983
 
    */
984
 
    if (cached_table)
985
 
    {
986
 
      assert(false); /* Not implemented yet */
987
 
    }
988
 
 
989
 
    /*
990
981
      Non pre-locked/LOCK TABLES mode, and the table is not temporary:
991
982
      this is the normal use case.
992
983
      Now we should:
1017
1008
      ppp= table::getCache().equal_range(key);
1018
1009
 
1019
1010
      table= NULL;
1020
 
      for (table::CacheMap::const_iterator iter= ppp.first;
1021
 
           iter != ppp.second; ++iter, table= NULL)
 
1011
      for (table::CacheMap::const_iterator iter= ppp.first; iter != ppp.second; ++iter, table= NULL)
1022
1012
      {
1023
1013
        table= iter->second;
1024
1014