← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_key.c

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_key.c
16
16
/* Functions to handle keys */
17
17
 
18
18
#include "myisamdef.h"
19
 
#include "m_ctype.h"
 
19
#include <mystrings/m_ctype.h>
20
20
#ifdef HAVE_IEEEFP_H
21
21
#include <ieeefp.h>
22
22
#endif
125
125
    else if (keyseg->flag & HA_BLOB_PART)
126
126
    {
127
127
      uint tmp_length=_mi_calc_blob_length(keyseg->bit_start,pos);
128
 
      memcpy_fixed((uchar*) &pos,pos+keyseg->bit_start,sizeof(char*));
 
128
      memcpy((uchar*) &pos,pos+keyseg->bit_start,sizeof(char*));
129
129
      set_if_smaller(length,tmp_length);
130
130
      FIX_LENGTH(cs, pos, length, char_length);
131
131
      store_key_length_inc(key,char_length);
143
143
        if (isnan(nr))
144
144
        {
145
145
          /* Replace NAN with zero */
146
 
          bzero(key,length);
 
146
          memset(key, 0, length);
147
147
          key+=length;
148
148
          continue;
149
149
        }
154
154
        float8get(nr,pos);
155
155
        if (isnan(nr))
156
156
        {
157
 
          bzero(key,length);
 
157
          memset(key, 0, length);
158
158
          key+=length;
159
159
          continue;
160
160
        }
360
360
      }
361
361
      else
362
362
      {
363
 
        bfill(pos,keyseg->length-length,' ');
 
363
        memset(pos, ' ', keyseg->length-length);
364
364
        memcpy(pos+keyseg->length-length,key,(size_t) length);
365
365
      }
366
366
      key+=length;