← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join_cache.cc

  • Committer: Monty Taylor
  • Date: 2010-10-21 23:10:12 UTC
  • mto: (1879.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1880.
  • Revision ID: mordred@inaugust.com-20101021231012-uhsebiqo23xi0ygy
Updated AUTHORS list with everyone from bzr logs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join_cache.cc
1
1
/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008-2009 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008-2009 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
27
27
 * @{
28
28
 */
29
29
 
30
 
#include <config.h>
31
 
 
32
 
#include <drizzled/sql_select.h> /* include join.h */
33
 
#include <drizzled/field/blob.h>
34
 
#include <drizzled/drizzled.h>
35
 
#include <drizzled/internal/my_sys.h>
36
 
#include <drizzled/table.h>
37
 
#include <drizzled/session.h>
 
30
#include "config.h"
 
31
#include "drizzled/sql_select.h" /* include join.h */
 
32
#include "drizzled/field/blob.h"
38
33
 
39
34
#include <algorithm>
40
35
 
92
87
  if (!(cache->field=(CacheField*)
93
88
        memory::sql_alloc(sizeof(CacheField)*(cache->fields+table_count*2)+(blobs+1)* sizeof(CacheField*))))
94
89
  {
95
 
    size= cache->end - cache->buff;
96
 
    global_join_buffer.sub(size);
97
90
    free((unsigned char*) cache->buff);
98
91
    cache->buff=0;
99
92
    return(1);
169
162
  cache->blobs= blobs;
170
163
  *blob_ptr= NULL;                                      /* End sequentel */
171
164
  size= max((size_t) session->variables.join_buff_size, (size_t)cache->length);
172
 
  if (not global_join_buffer.add(size))
173
 
  {
174
 
    my_error(ER_OUT_OF_GLOBAL_JOINMEMORY, MYF(ME_ERROR+ME_WAITTANG));
175
 
    return 1;
176
 
  }
177
165
  if (!(cache->buff= (unsigned char*) malloc(size)))
178
166
    return 1;
179
167
  cache->end= cache->buff+size;