~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/structs.h

Moved opt_range.[cc,h] into the optimizer directory and namespace and renamed the files to
range.[cc,h]. Removed the opt_range.h include in the server_includes.h header file. Need to do more
work on that header file as I had to add some extra includes in there to compensate for removing
that header file. Cleaned up a bunch of style in the range.[cc,h] files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
#ifndef DRIZZLED_STRUCTS_H
24
24
#define DRIZZLED_STRUCTS_H
25
25
 
26
 
#include <drizzled/base.h>
27
 
#include <mysys/definitions.h>
28
 
#include <drizzled/lex_string.h>
 
26
#include "drizzled/base.h"
 
27
#include "mysys/definitions.h"
 
28
#include "drizzled/lex_string.h"
29
29
 
30
30
class Table;
31
31
class Field;
117
117
};
118
118
 
119
119
struct st_read_record;                          /* For referense later */
120
 
class SQL_SELECT;
121
120
class Session;
122
121
class Cursor;
 
122
namespace drizzled { namespace optimizer { class SQL_SELECT; } }
123
123
 
124
124
typedef struct st_read_record {                 /* Parameter to read_record */
125
125
  Table *table;                 /* Head-form */
127
127
  Table **forms;                        /* head and ref forms */
128
128
  int (*read_record)(struct st_read_record *);
129
129
  Session *session;
130
 
  SQL_SELECT *select;
 
130
  drizzled::optimizer::SQL_SELECT *select;
131
131
  uint32_t cache_records;
132
132
  uint32_t ref_length,struct_length,reclength,rec_cache_size,error_offset;
133
133
  uint32_t index;