← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/dtcollation.h

  • Committer: Lee Bieber
  • Date: 2010-11-07 19:34:48 UTC
  • mfrom: (1910.1.2 build)
  • Revision ID: kalebral@gmail.com-20101107193448-64kdu912qej354sh
Merge Stewart - including adapting and expanding the "differences from mysql" page from the wiki.
Merge Stewart - fix bug 668143: drizzleslap with --commit runs second iteration data load in a transaction

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/dtcollation.h
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
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>
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