← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/dtcollation.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

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