← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto.h
21
21
#ifndef DRIZZLED_TABLE_PROTO_H
22
22
#define DRIZZLED_TABLE_PROTO_H
23
23
 
 
24
namespace drizzled {
 
25
 
24
26
int drizzle_write_proto_file(const std::string file_name,
25
 
                             drizzled::message::Table *table_proto);
26
 
int create_table_proto_file(const char *file_name,
27
 
                            const char *db,
28
 
                            const char *table_name,
29
 
                            drizzled::message::Table *table_proto,
30
 
                            HA_CREATE_INFO *create_info,
31
 
                            List<CreateField> &create_fields,
32
 
                            uint32_t keys,
33
 
                            KEY *key_info);
 
27
                             message::Table *table_proto);
34
28
 
35
29
int parse_table_proto(Session *session,
36
 
                      drizzled::message::Table &table,
 
30
                      message::Table &table,
37
31
                      TableShare *share);
38
32
 
39
 
int fill_table_proto(drizzled::message::Table *table_proto,
 
33
int fill_table_proto(message::Table *table_proto,
40
34
                     const char *table_name,
41
35
                     List<CreateField> &create_fields,
42
36
                     HA_CREATE_INFO *create_info,
43
37
                     uint32_t keys,
44
38
                     KEY *key_info);
45
39
 
 
40
int rename_table_proto_file(const char *from, const char* to);
 
41
int delete_table_proto_file(const char *file_name);
 
42
 
46
43
int rea_create_table(Session *session, const char *path,
47
44
                     const char *db, const char *table_name,
48
 
                     drizzled::message::Table *table_proto,
 
45
                     message::Table *table_proto,
49
46
                     HA_CREATE_INFO *create_info,
50
47
                     List<CreateField> &create_field,
51
48
                     uint32_t key_count,KEY *key_info);
52
 
#endif
 
49
 
 
50
} /* namespace drizzled */
 
51
 
 
52
#endif /* DRIZZLED_TABLE_PROTO_H */