← 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-04 09:29:39 UTC
  • mfrom: (2139.3.6 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2144.
  • Revision ID: brian@tangent.org-20110204092939-nlwrimamw0fxxhgl
Main bit of this patch is that Inno now just uses the identifier so we only
have one spot to make changes for paths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/dtcollation.h
20
20
#ifndef DRIZZLED_DTCOLLATION_H
21
21
#define DRIZZLED_DTCOLLATION_H
22
22
 
23
 
#include <drizzled/definitions.h>
24
 
#include <drizzled/visibility.h>
 
23
#include "drizzled/definitions.h"
 
24
#include "drizzled/visibility.h"
25
25
 
26
26
namespace drizzled
27
27
{
28
28
 
29
29
class Item;
30
 
struct charset_info_st;
 
30
typedef struct charset_info_st CHARSET_INFO;
 
31
 
31
32
 
32
33
class DRIZZLED_API DTCollation
33
34
{
34
35
public:
35
 
  const charset_info_st *collation;
 
36
  const CHARSET_INFO *collation;
36
37
  enum Derivation derivation;
37
38
 
38
39
  DRIZZLED_LOCAL DTCollation();
39
 
  DRIZZLED_LOCAL DTCollation(const charset_info_st * const collation_arg,
 
40
  DRIZZLED_LOCAL DTCollation(const CHARSET_INFO * const collation_arg,
40
41
                             Derivation derivation_arg);
41
42
  void set(DTCollation &dt);
42
 
  void set(const charset_info_st * const collation_arg,
 
43
  void set(const CHARSET_INFO * const collation_arg,
43
44
           Derivation derivation_arg);
44
 
  void set(const charset_info_st * const collation_arg);
 
45
  void set(const CHARSET_INFO * const collation_arg);
45
46
  void set(Derivation derivation_arg);
46
47
  bool set(DTCollation &dt1, DTCollation &dt2, uint32_t flags= 0);
47
48