← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_key.cc

Merge Monty - Added inter-plugin dependencies for controlling plugin load order

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_key.cc
16
16
/* Functions to handle keys */
17
17
 
18
18
#include "myisam_priv.h"
19
 
#include <drizzled/charset.h>
 
19
#include "drizzled/charset_info.h"
20
20
#ifdef HAVE_IEEEFP_H
21
21
#include <ieeefp.h>
22
22
#endif
65
65
    enum drizzled::ha_base_keytype type=(enum drizzled::ha_base_keytype) keyseg->type;
66
66
    uint32_t length=keyseg->length;
67
67
    uint32_t char_length;
68
 
    const drizzled::charset_info_st * const cs=keyseg->charset;
 
68
    const drizzled::CHARSET_INFO * const cs=keyseg->charset;
69
69
 
70
70
    if (keyseg->null_bit)
71
71
    {
181
181
    uint32_t length= keyseg->length;
182
182
    uint32_t char_length;
183
183
    unsigned char *pos;
184
 
    const drizzled::charset_info_st * const cs=keyseg->charset;
 
184
    const drizzled::CHARSET_INFO * const cs=keyseg->charset;
185
185
    keypart_map>>= 1;
186
186
    if (keyseg->null_bit)
187
187
    {