← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/dtcollation.h

  • Committer: Brian Aker
  • Date: 2011-02-12 10:06:03 UTC
  • mfrom: (2154.2.16 drizzle-build)
  • Revision ID: brian@tangent.org-20110212100603-i5ww0s02p8l4a8q7
Merge in solaris tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/dtcollation.h
27
27
{
28
28
 
29
29
class Item;
30
 
typedef struct charset_info_st CHARSET_INFO;
31
 
 
 
30
struct charset_info_st;
32
31
 
33
32
class DRIZZLED_API DTCollation
34
33
{
35
34
public:
36
 
  const CHARSET_INFO *collation;
 
35
  const charset_info_st *collation;
37
36
  enum Derivation derivation;
38
37
 
39
38
  DRIZZLED_LOCAL DTCollation();
40
 
  DRIZZLED_LOCAL DTCollation(const CHARSET_INFO * const collation_arg,
 
39
  DRIZZLED_LOCAL DTCollation(const charset_info_st * const collation_arg,
41
40
                             Derivation derivation_arg);
42
41
  void set(DTCollation &dt);
43
 
  void set(const CHARSET_INFO * const collation_arg,
 
42
  void set(const charset_info_st * const collation_arg,
44
43
           Derivation derivation_arg);
45
 
  void set(const CHARSET_INFO * const collation_arg);
 
44
  void set(const charset_info_st * const collation_arg);
46
45
  void set(Derivation derivation_arg);
47
46
  bool set(DTCollation &dt1, DTCollation &dt2, uint32_t flags= 0);
48
47