← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
21
21
  Sorts a database
22
22
*/
23
23
 
24
 
#include "drizzled/server_includes.h"
 
24
#include "config.h"
 
25
 
 
26
#include <float.h>
 
27
 
 
28
#include <queue>
 
29
#include <algorithm>
 
30
 
25
31
#include "drizzled/sql_sort.h"
26
32
#include "drizzled/error.h"
27
33
#include "drizzled/probes.h"
31
37
#include "drizzled/optimizer/range.h"
32
38
#include "drizzled/records.h"
33
39
 
34
 
#include <queue>
35
 
#include <algorithm>
36
 
 
37
40
using namespace std;
38
41
using namespace drizzled;
39
42