← Back to branch summary

~eday/drizzle/eday-dev

« back to all changes in this revision

Viewing changes to drizzled/join_cache.cc

  • Committer: Eric Day
  • Date: 2010-01-07 20:02:38 UTC
  • mfrom: (971.3.291 staging)
  • Revision ID: eday@oddments.org-20100107200238-uqw8v6kv9pl7nny5
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join_cache.cc
27
27
 * @{
28
28
 */
29
29
 
30
 
#include "drizzled/server_includes.h"
 
30
#include "config.h"
31
31
#include "drizzled/sql_select.h" /* include join.h */
32
32
#include "drizzled/field/blob.h"
33
33
 
34
34
#include <algorithm>
35
35
 
 
36
using namespace drizzled;
36
37
using namespace std;
37
38
 
38
39
static uint32_t used_blob_length(CACHE_FIELD **ptr);
83
84
    }
84
85
  }
85
86
  if (!(cache->field=(CACHE_FIELD*)
86
 
        sql_alloc(sizeof(CACHE_FIELD)*(cache->fields+table_count*2)+(blobs+1)*
 
87
        memory::sql_alloc(sizeof(CACHE_FIELD)*(cache->fields+table_count*2)+(blobs+1)*
87
88
 
88
89
                  sizeof(CACHE_FIELD*))))
89
90
  {