← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/dtcollation.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.1.6)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20120619104649-e2l0ggd4oz3um0f4
Tags: upstream-7.1.36-stable
Import upstream version 7.1.36-stable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/dtcollation.cc
22
22
 
23
23
#include <drizzled/definitions.h>
24
24
#include <drizzled/internal/my_sys.h>
25
 
#include <drizzled/charset_info.h>
26
25
#include <drizzled/error.h>
27
26
#include <drizzled/function/str/conv_charset.h>
28
27
#include <drizzled/session.h>
29
28
#include <drizzled/charset.h>
30
29
 
31
 
namespace drizzled
32
 
{
 
30
namespace drizzled {
33
31
 
34
32
DTCollation::DTCollation()
35
33
{
38
36
}
39
37
 
40
38
 
41
 
DTCollation::DTCollation(const CHARSET_INFO * const collation_arg,
 
39
DTCollation::DTCollation(const charset_info_st * const collation_arg,
42
40
                         Derivation derivation_arg)
43
41
{
44
42
  collation= collation_arg;
53
51
}
54
52
 
55
53
 
56
 
void DTCollation::set(const CHARSET_INFO * const collation_arg,
 
54
void DTCollation::set(const charset_info_st * const collation_arg,
57
55
                      Derivation derivation_arg)
58
56
{
59
57
  collation= collation_arg;
61
59
}
62
60
 
63
61
 
64
 
void DTCollation::set(const CHARSET_INFO * const collation_arg)
 
62
void DTCollation::set(const charset_info_st * const collation_arg)
65
63
{
66
64
  collation= collation_arg;
67
65
}
166
164
        set(dt);
167
165
        return false;
168
166
      }
169
 
      const CHARSET_INFO * const bin= get_charset_by_csname(collation->csname, MY_CS_BINSORT);
 
167
      const charset_info_st * const bin= get_charset_by_csname(collation->csname, MY_CS_BINSORT);
170
168
      set(bin, DERIVATION_NONE);
171
169
    }
172
170
  }