← 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
24
24
#include "config.h"
25
25
 
26
26
#include <float.h>
 
27
#include <limits.h>
27
28
 
28
29
#include <queue>
29
30
#include <algorithm>
36
37
#include "drizzled/table_list.h"
37
38
#include "drizzled/optimizer/range.h"
38
39
#include "drizzled/records.h"
 
40
#include "drizzled/internal/iocache.h"
 
41
#include "drizzled/internal/my_sys.h"
 
42
#include "plugin/myisam/myisam.h"
39
43
 
40
44
using namespace std;
41
45
using namespace drizzled;
530
534
      {
531
535
        if (my_b_read(indexfile,(unsigned char*) ref_pos,ref_length))
532
536
        {
533
 
          error= my_errno ? my_errno : -1;              /* Abort */
 
537
          error= errno ? errno : -1;            /* Abort */
534
538
          break;
535
539
        }
536
540
        error=file->rnd_pos(sort_form->record[0],next_pos);