← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_delete.cc

  • Committer: Jay Pipes
  • Date: 2010-03-09 20:02:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1339.
  • Revision ID: jpipes@serialcoder-20100309200229-dfrliy4fads9vyf4
https://launchpad.net/bugs/535296
Fixes Bug #535296 by only incrementing ha_commit_count when its a normal transaction commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_delete.cc
1
 
/* Copyright (C) 2000-2002, 2004-2006 MySQL AB
 
1
/* Copyright (C) 2000-2002, 2004-200 MySQL AB
2
2
 
3
3
   This program is free software; you can redistribute it and/or modify
4
4
   it under the terms of the GNU General Public License as published by
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
/* remove current record in heap-database */
17
17
 
20
20
int heap_delete(HP_INFO *info, const unsigned char *record)
21
21
{
22
22
  unsigned char *pos;
23
 
  HP_SHARE *share=info->getShare();
 
23
  HP_SHARE *share=info->s;
24
24
  HP_KEYDEF *keydef, *end, *p_lastinx;
 
25
  uint32_t rec_length, chunk_count;
25
26
 
26
27
  test_active(info);
27
28
 
28
29
  if (info->opt_flag & READ_CHECK_USED)
29
 
    return(errno);   /* Record changed */
 
30
    return(errno);                      /* Record changed */
30
31
  share->changed=1;
31
32
 
 
33
  rec_length = hp_get_encoded_data_length(share, record, &chunk_count);
 
34
 
32
35
  if ( --(share->records) < share->blength >> 1) share->blength>>=1;
33
36
  pos=info->current_ptr;
34
37
 
36
39
  for (keydef = share->keydef, end = keydef + share->keys; keydef < end;
37
40
       keydef++)
38
41
  {
39
 
    if (hp_delete_key(info, keydef, record, pos, keydef == p_lastinx))
 
42
    if ((*keydef->delete_key)(info, keydef, record, pos, keydef == p_lastinx))
40
43
      goto err;
41
44
  }
42
45
 
53
56
 
54
57
 
55
58
/*
 
59
  Remove one key from rb-tree
 
60
*/
 
61
 
 
62
int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo,
 
63
                   const unsigned char *record, unsigned char *recpos, int flag)
 
64
{
 
65
  heap_rb_param custom_arg;
 
66
  uint32_t old_allocated;
 
67
  int res;
 
68
 
 
69
  if (flag)
 
70
    info->last_pos= NULL; /* For heap_rnext/heap_rprev */
 
71
 
 
72
  custom_arg.keyseg= keyinfo->seg;
 
73
  custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos);
 
74
  custom_arg.search_flag= SEARCH_SAME;
 
75
  old_allocated= keyinfo->rb_tree.allocated;
 
76
  res= tree_delete(&keyinfo->rb_tree, info->recbuf, custom_arg.key_length,
 
77
                   &custom_arg);
 
78
  info->s->index_length-= (old_allocated - keyinfo->rb_tree.allocated);
 
79
  return res;
 
80
}
 
81
 
 
82
 
 
83
/*
56
84
  Remove one key from hash-table
57
85
 
58
86
  SYNPOSIS
73
101
{
74
102
  uint32_t blength,pos2,pos_hashnr,lastpos_hashnr;
75
103
  HASH_INFO *lastpos,*gpos,*pos,*pos3,*empty,*last_ptr;
76
 
  HP_SHARE *share=info->getShare();
 
104
  HP_SHARE *share=info->s;
77
105
 
78
106
  blength=share->blength;
79
107
  if (share->records+1 == blength)
97
125
    gpos=pos;
98
126
    if (!(pos=pos->next_key))
99
127
    {
100
 
      return(errno= drizzled::HA_ERR_CRASHED);  /* This shouldn't happend */
 
128
      return(errno=HA_ERR_CRASHED);     /* This shouldn't happend */
101
129
    }
102
130
  }
103
131