~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/typelib.h

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
  const char *get_type(unsigned int nr) const;
32
32
  void make_type(char *to, unsigned int nr) const;
33
33
 
34
 
  uint64_t find_set(const char *x, uint32_t length, const CHARSET_INFO *cs,
 
34
  uint64_t find_set(const char *x, uint32_t length, const charset_info_st *cs,
35
35
                    char **err_pos, uint32_t *err_len, bool *set_warning) const;
36
36
  uint32_t find_type(const char *find, uint32_t length, bool part_match) const;
37
 
  uint32_t find_type2(const char *find, uint32_t length, const CHARSET_INFO *cs) const;
 
37
  uint32_t find_type2(const char *find, uint32_t length, const charset_info_st *cs) const;
38
38
 
39
39
  unsigned int count;
40
40
  const char *name;