← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/server_includes.h

Merge from Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/server_includes.h
242
242
uint32_t calc_week(DRIZZLE_TIME *l_time, uint32_t week_behaviour, uint32_t *year);
243
243
void find_date(char *pos,uint32_t *vek,uint32_t flag);
244
244
TYPELIB *convert_strings_to_array_type(char * *typelibs, char * *end);
245
 
TYPELIB *typelib(MEM_ROOT *mem_root, List<String> &strings);
 
245
TYPELIB *typelib(MEM_ROOT *mem_root, std::vector<String*> &strings);
246
246
ulong get_form_pos(File file, unsigned char *head, TYPELIB *save_names);
247
247
ulong next_io_size(ulong pos);
248
248
void append_unescaped(String *res, const char *pos, uint32_t length);