← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_preload.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_preload.cc
67
67
    }
68
68
  }
69
69
  else
70
 
    block_length= share->key_cache->key_cache_block_size;
 
70
    block_length= share->getKeyCache()->key_cache_block_size;
71
71
 
72
72
  length= info->preload_buff_size/block_length * block_length;
73
73
  set_if_bigger(length, block_length);
75
75
  if (!(buff= (unsigned char *) malloc(length)))
76
76
    return(errno= HA_ERR_OUT_OF_MEM);
77
77
 
78
 
  if (flush_key_blocks(share->key_cache,share->kfile, FLUSH_RELEASE))
 
78
  if (flush_key_blocks(share->getKeyCache(), share->kfile, FLUSH_RELEASE))
79
79
    goto err;
80
80
 
81
81
  do
93
93
      {
94
94
        if (mi_test_if_nod(buff))
95
95
        {
96
 
          if (key_cache_insert(share->key_cache,
 
96
          if (key_cache_insert(share->getKeyCache(),
97
97
                               share->kfile, pos, DFLT_INIT_HITS,
98
98
                              (unsigned char*) buff, block_length))
99
99
            goto err;
105
105
    }
106
106
    else
107
107
    {
108
 
      if (key_cache_insert(share->key_cache,
 
108
      if (key_cache_insert(share->getKeyCache(),
109
109
                           share->kfile, pos, DFLT_INIT_HITS,
110
110
                           (unsigned char*) buff, length))
111
111
        goto err;