← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
27
27
 * @{
28
28
 */
29
29
 
30
 
#include "drizzled/server_includes.h"
 
30
#include "config.h"
 
31
 
 
32
#include <float.h>
 
33
#include <math.h>
 
34
 
31
35
#include "drizzled/item/cache.h"
32
36
#include "drizzled/item/cmpfunc.h"
33
37
#include "drizzled/item/copy_string.h"
56
60
using namespace std;
57
61
using namespace drizzled;
58
62
 
 
63
extern drizzled::plugin::StorageEngine *heap_engine;
 
64
extern std::bitset<12> test_flags;
 
65
 
59
66
/** Declarations of static functions used in this source file. */
60
67
static bool make_group_fields(JOIN *main_join, JOIN *curr_join);
61
68
static void calc_group_buffer(JOIN *join,order_st *group);