~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: lbieber
  • Date: 2010-09-11 00:47:34 UTC
  • mfrom: (1756.1.2 build)
  • Revision ID: lbieber@orisndriz03-20100911004734-m5kvdu6q2nq0u43w
Merge Brian - cppcheck fixes and also modifies unique lookup such that we let the OS handle paging for unique checking (instead of trying to mimic it through using a self built IO_CACHE).
Merge Andrew - fix test result for embedded_innodb 

Show diffs side-by-side

added added

removed removed

Lines of Context:
47
47
#include "drizzled/cached_directory.h"
48
48
#include <drizzled/field/timestamp.h>
49
49
#include <drizzled/field/null.h>
50
 
#include "drizzled/memory/multi_malloc.h"
51
50
#include "drizzled/sql_table.h"
52
51
#include "drizzled/global_charset_info.h"
53
52
#include "drizzled/pthread_globals.h"
1081
1080
 
1082
1081
  /*
1083
1082
    Create a table entry with the right key and with an old refresh version
1084
 
    Note that we must use multi_malloc() here as this is freed by the
1085
 
    table cache
1086
1083
  */
1087
1084
  TableIdentifier identifier(db_name, table_name, message::Table::INTERNAL);
1088
1085
  TablePlaceholder *table= new TablePlaceholder(this, identifier);