← 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-01-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/dtcollation.h
21
21
#define DRIZZLED_DTCOLLATION_H
22
22
 
23
23
#include <drizzled/definitions.h>
24
 
#include <drizzled/visibility.h>
25
24
 
26
25
namespace drizzled
27
26
{
28
27
 
29
28
class Item;
30
 
struct charset_info_st;
31
 
 
32
 
class DRIZZLED_API DTCollation
33
 
{
 
29
typedef struct charset_info_st CHARSET_INFO;
 
30
 
 
31
 
 
32
class DTCollation {
34
33
public:
35
 
  const charset_info_st *collation;
 
34
  const CHARSET_INFO *collation;
36
35
  enum Derivation derivation;
37
36
 
38
 
  DRIZZLED_LOCAL DTCollation();
39
 
  DRIZZLED_LOCAL DTCollation(const charset_info_st * const collation_arg,
40
 
                             Derivation derivation_arg);
 
37
  DTCollation();
 
38
  DTCollation(const CHARSET_INFO * const collation_arg,
 
39
              Derivation derivation_arg);
41
40
  void set(DTCollation &dt);
42
 
  void set(const charset_info_st * const collation_arg,
 
41
  void set(const CHARSET_INFO * const collation_arg,
43
42
           Derivation derivation_arg);
44
 
  void set(const charset_info_st * const collation_arg);
 
43
  void set(const CHARSET_INFO * const collation_arg);
45
44
  void set(Derivation derivation_arg);
46
45
  bool set(DTCollation &dt1, DTCollation &dt2, uint32_t flags= 0);
47
46
 
81
80
  @endcode
82
81
*/
83
82
 
84
 
  DRIZZLED_LOCAL bool aggregate(DTCollation &dt, uint32_t flags= 0);
 
83
  bool aggregate(DTCollation &dt, uint32_t flags= 0);
85
84
 
86
 
  DRIZZLED_LOCAL const char *derivation_name() const;
 
85
  const char *derivation_name() const;
87
86
 
88
87
};
89
88