← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/collation_dictionary/collations.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-28 14:32:36 UTC
  • mto: (2257.1.1 build) (2276.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: olafvdspek@gmail.com-20110328143236-4ge1d793iqaktfq0
Common fwd

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/collation_dictionary/collations.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
22
 
#include "plugin/collation_dictionary/dictionary.h"
 
21
#include <config.h>
 
22
#include <plugin/collation_dictionary/dictionary.h>
23
23
 
24
24
using namespace std;
25
25
using namespace drizzled;
32
32
  add_field("COLLATION_NAME");
33
33
  add_field("DESCRIPTION");
34
34
  add_field("ID", plugin::TableFunction::NUMBER, 0, false);
35
 
  add_field("IS_DEFAULT", plugin::TableFunction::BOOLEAN);
36
 
  add_field("IS_COMPILED", plugin::TableFunction::BOOLEAN);
 
35
  add_field("IS_DEFAULT", plugin::TableFunction::BOOLEAN, 0, false);
 
36
  add_field("IS_COMPILED", plugin::TableFunction::BOOLEAN, 0, false);
37
37
  add_field("SORTLEN", plugin::TableFunction::NUMBER, 0, false);
38
38
}
39
39
 
52
52
 
53
53
bool CollationsTool::Generator::check()
54
54
{
55
 
  const CHARSET_INFO *tmp_cs= character_set();
56
 
  const CHARSET_INFO *tmp_cl= collation();
 
55
  const charset_info_st *tmp_cs= character_set();
 
56
  const charset_info_st *tmp_cl= collation();
57
57
 
58
58
  if (not tmp_cl || 
59
59
      not (tmp_cl->state & MY_CS_AVAILABLE) ||
117
117
 
118
118
void CollationsTool::Generator::fill()
119
119
{
120
 
  const CHARSET_INFO *tmp_cs= character_set();
121
 
  const CHARSET_INFO *tmp_cl= collation_iter[0];
 
120
  const charset_info_st *tmp_cs= character_set();
 
121
  const charset_info_st *tmp_cl= collation_iter[0];
122
122
 
123
123
  assert(tmp_cs);
124
124
  assert(tmp_cl);