← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty Taylor
  • Date: 2009-09-22 22:19:58 UTC
  • mto: This revision was merged to the branch mainline in revision 1184.
  • Revision ID: mordred@inaugust.com-20090922221958-l4d9ogwfs55513eo
Moved multi_malloc into drizzled since it's not going away any time soon. Also,
cleaned it up a bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
23
23
  @{
24
24
*/
25
25
#include "drizzled/server_includes.h"
 
26
 
 
27
#include <string>
 
28
#include <iostream>
 
29
#include <algorithm>
 
30
#include <vector>
 
31
 
26
32
#include "drizzled/sql_select.h" /* include join.h */
27
33
#include "drizzled/table_map_iterator.h"
28
34
 
45
51
#include "drizzled/lock.h"
46
52
#include "drizzled/item/outer_ref.h"
47
53
#include "drizzled/index_hint.h"
48
 
 
49
 
#include <drizzled/sql_union.h>
50
 
#include <drizzled/optimizer/key_field.h>
51
 
#include <drizzled/optimizer/position.h>
52
 
#include <drizzled/optimizer/sargable_param.h>
53
 
 
54
 
#include <string>
55
 
#include <iostream>
56
 
#include <algorithm>
57
 
#include <vector>
 
54
#include "drizzled/memory/multi_malloc.h"
 
55
 
 
56
#include "drizzled/sql_union.h"
 
57
#include "drizzled/optimizer/key_field.h"
 
58
#include "drizzled/optimizer/position.h"
 
59
#include "drizzled/optimizer/sargable_param.h"
 
60
 
58
61
 
59
62
using namespace std;
60
63
using namespace drizzled;
5412
5415
  uint32_t *field_lengths,*field_length;
5413
5416
  HASH hash;
5414
5417
 
5415
 
  if (!my_multi_malloc(MYF(MY_WME),
 
5418
  if (! memory::multi_malloc(false,
5416
5419
                       &key_buffer,
5417
5420
                       (uint32_t) ((key_length + extra_length) *
5418
5421
                               (long) file->stats.records),