← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.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/opt_range.cc
118
118
#include <vector>
119
119
#include <algorithm>
120
120
 
 
121
#include "drizzled/memory/multi_malloc.h"
 
122
 
121
123
using namespace std;
 
124
using namespace drizzled;
122
125
 
123
126
#define HA_END_SPACE_KEY 0
124
127
 
7147
7150
  if (mrr_buf_size && !mrr_buf_desc)
7148
7151
  {
7149
7152
    buf_size= mrr_buf_size;
7150
 
    while (buf_size && !my_multi_malloc(MYF(MY_WME),
 
7153
    while (buf_size && ! memory::multi_malloc(false,
7151
7154
                                        &mrr_buf_desc, sizeof(*mrr_buf_desc),
7152
7155
                                        &mrange_buff, buf_size,
7153
7156
                                        NULL))