← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_page.cc

  • Committer: Brian Aker
  • Date: 2010-02-14 01:56:51 UTC
  • mto: (1273.16.5 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: brian@gaz-20100214015651-ror9j0xu7dccz0ct
Two fixes for "make dist"

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_page.cc
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
/* Read and write key blocks */
17
17
 
28
28
  unsigned char *tmp;
29
29
  uint32_t page_size;
30
30
 
31
 
  tmp=(unsigned char*) key_cache_read(info->s->getKeyCache(),
 
31
  tmp=(unsigned char*) key_cache_read(info->s->key_cache,
32
32
                             info->s->kfile, page, level, (unsigned char*) buff,
33
33
                             (uint) keyinfo->block_length,
34
34
                             (uint) keyinfo->block_length,
75
75
  if ((length=keyinfo->block_length) > IO_SIZE*2 &&
76
76
      info->state->key_file_length != page+length)
77
77
    length= ((mi_getint(buff)+IO_SIZE-1) & (uint) ~(IO_SIZE-1));
78
 
#ifdef HAVE_VALGRIND
 
78
#ifdef HAVE_purify
79
79
  {
80
80
    length=mi_getint(buff);
81
81
    memset(buff+length, 0, keyinfo->block_length-length);
82
82
    length=keyinfo->block_length;
83
83
  }
84
84
#endif
85
 
  return((key_cache_write(info->s->getKeyCache(),
 
85
  return((key_cache_write(info->s->key_cache,
86
86
                         info->s->kfile,page, level, (unsigned char*) buff,length,
87
87
                         (uint) keyinfo->block_length,
88
88
                         (int) ((info->lock_type != F_UNLCK) ||
102
102
  info->s->state.key_del[keyinfo->block_size_index]= pos;
103
103
  mi_sizestore(buff,old_link);
104
104
  info->s->state.changed|= STATE_NOT_SORTED_PAGES;
105
 
  return(key_cache_write(info->s->getKeyCache(),
 
105
  return(key_cache_write(info->s->key_cache,
106
106
                              info->s->kfile, pos , level, buff,
107
107
                              sizeof(buff),
108
108
                              (uint) keyinfo->block_length,
131
131
  }
132
132
  else
133
133
  {
134
 
    if (!key_cache_read(info->s->getKeyCache(),
 
134
    if (!key_cache_read(info->s->key_cache,
135
135
                        info->s->kfile, pos, level,
136
136
                        buff,
137
137
                        (uint) sizeof(buff),