← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_update.c

  • Committer: Monty Taylor
  • Date: 2008-09-15 17:24:04 UTC
  • Revision ID: monty@inaugust.com-20080915172404-ygh6hiyu0q7qpa9x
Removed strndup calls.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_update.c
16
16
/* Update an old row in a MyISAM table */
17
17
 
18
18
#include "myisamdef.h"
19
 
#include <drizzled/util/test.h>
20
19
 
21
 
int mi_update(register MI_INFO *info, const unsigned char *oldrec, unsigned char *newrec)
 
20
int mi_update(register MI_INFO *info, const uchar *oldrec, uchar *newrec)
22
21
{
23
22
  int flag,key_changed,save_errno;
24
23
  register my_off_t pos;
25
 
  uint32_t i;
26
 
  unsigned char old_key[MI_MAX_KEY_BUFF],*new_key;
 
24
  uint i;
 
25
  uchar old_key[MI_MAX_KEY_BUFF],*new_key;
27
26
  bool auto_key_changed=0;
28
27
  uint64_t changed;
29
28
  MYISAM_SHARE *share= info->s;
82
81
    if (mi_is_key_active(share->state.key_map, i))
83
82
    {
84
83
      {
85
 
        uint32_t new_length=_mi_make_key(info,i,new_key,newrec,pos);
86
 
        uint32_t old_length=_mi_make_key(info,i,old_key,oldrec,pos);
 
84
        uint new_length=_mi_make_key(info,i,new_key,newrec,pos);
 
85
        uint old_length=_mi_make_key(info,i,old_key,oldrec,pos);
87
86
 
88
87
        /* The above changed info->lastkey2. Inform mi_rnext_same(). */
89
88
        info->update&= ~HA_STATE_RNEXT_SAME;
154
153
    mi_update() must always pass !0 value as operation, since even if
155
154
    there is no index change there could be data change.
156
155
  */
157
 
  _mi_writeinfo(info, WRITEINFO_UPDATE_KEYFILE);
 
156
  VOID(_mi_writeinfo(info, WRITEINFO_UPDATE_KEYFILE));
158
157
  if (info->invalidator != 0)
159
158
  {
160
159
    (*info->invalidator)(info->filename);
176
175
      if (((uint64_t) 1 << i) & changed)
177
176
      {
178
177
        {
179
 
          uint32_t new_length=_mi_make_key(info,i,new_key,newrec,pos);
180
 
          uint32_t old_length= _mi_make_key(info,i,old_key,oldrec,pos);
 
178
          uint new_length=_mi_make_key(info,i,new_key,newrec,pos);
 
179
          uint old_length= _mi_make_key(info,i,old_key,oldrec,pos);
181
180
          if ((flag++ && _mi_ck_delete(info,i,new_key,new_length)) ||
182
181
              _mi_ck_write(info,i,old_key,old_length))
183
182
            break;
194
193
                 key_changed);
195
194
 
196
195
 err_end:
197
 
  _mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
 
196
  VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
198
197
  if (save_errno == HA_ERR_KEY_NOT_FOUND)
199
198
  {
200
199
    mi_print_error(info->s, HA_ERR_CRASHED);