← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-07-12 06:38:23 UTC
  • mfrom: (1093 staging)
  • mto: (1093.1.25 captain)
  • mto: This revision was merged to the branch mainline in revision 1099.
  • Revision ID: osullivan.padraig@gmail.com-20090712063823-baa8sosar2qdq2lh
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
20
20
#include <drizzled/error.h>
21
21
#include <drizzled/gettext.h>
22
22
 
23
 
#include <drizzled/sj_tmp_table.h>
 
23
#include <drizzled/semi_join_table.h>
24
24
#include <drizzled/nested_join.h>
25
25
#include <drizzled/sql_parse.h>
26
26
#include <drizzled/item/sum.h>
27
27
#include <drizzled/table_list.h>
28
28
#include <drizzled/session.h>
29
29
#include <drizzled/sql_base.h>
 
30
#include <drizzled/sql_select.h>
30
31
#include <drizzled/field/blob.h>
31
32
#include <drizzled/field/varstring.h>
32
33
#include <drizzled/field/double.h>
33
 
#include <string>
34
 
#include <vector>
35
 
#include <algorithm>
36
 
 
37
34
#include <drizzled/unireg.h>
38
35
#include <drizzled/message/table.pb.h>
39
36
 
43
40
#include <drizzled/item/float.h>
44
41
#include <drizzled/item/null.h>
45
42
 
 
43
#include <string>
 
44
#include <vector>
 
45
#include <algorithm>
 
46
 
46
47
 
47
48
using namespace std;
48
49
 
161
162
}
162
163
 
163
164
 
164
 
enum_field_types proto_field_type_to_drizzle_type(uint32_t proto_field_type)
 
165
static enum_field_types proto_field_type_to_drizzle_type(uint32_t proto_field_type)
165
166
{
166
167
  enum_field_types field_type;
167
168
 
208
209
  return field_type;
209
210
}
210
211
 
211
 
Item * default_value_item(enum_field_types field_type,
212
 
                          const CHARSET_INFO *charset,
213
 
                          bool default_null, const string *default_value,
214
 
                          const string *default_bin_value)
 
212
static Item *default_value_item(enum_field_types field_type,
 
213
                                const CHARSET_INFO *charset,
 
214
                                bool default_null, const string *default_value,
 
215
                                const string *default_bin_value)
215
216
{
216
217
  Item *default_item= NULL;
217
218
  int error= 0;
273
274
  return default_item;
274
275
}
275
276
 
276
 
int parse_table_proto(Session *session, drizzled::message::Table &table, TableShare *share)
 
277
static int parse_table_proto(Session *session,
 
278
                             drizzled::message::Table &table,
 
279
                             TableShare *share)
277
280
{
278
281
  int error= 0;
279
282
  handler *handler_file= NULL;
2265
2268
    new_created field
2266
2269
*/
2267
2270
 
2268
 
Field *create_tmp_field_for_schema(Item *item, Table *table)
 
2271
static Field *create_tmp_field_for_schema(Item *item, Table *table)
2269
2272
{
2270
2273
  if (item->field_type() == DRIZZLE_TYPE_VARCHAR)
2271
2274
  {