← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to plugin/archive/ha_archive.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-03-15 14:05:26 UTC
  • mfrom: (1237.9.99 staging)
  • Revision ID: osullivan.padraig@gmail.com-20100315140526-opbgwdwn6tfecdkq
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/archive/ha_archive.cc
166
166
 
167
167
 
168
168
int ArchiveEngine::doDropTable(Session&,
169
 
                               const string table_path)
 
169
                               const string &table_path)
170
170
{
171
171
  string new_path(table_path);
172
172
 
706
706
  if (share->crashed)
707
707
    return(HA_ERR_CRASHED_ON_USAGE);
708
708
 
709
 
  ha_statistic_increment(&SSV::ha_write_count);
 
709
  ha_statistic_increment(&system_status_var::ha_write_count);
710
710
  pthread_mutex_lock(&share->mutex);
711
711
 
712
712
  if (share->archive_write_open == false)
940
940
    return(HA_ERR_END_OF_FILE);
941
941
  scan_rows--;
942
942
 
943
 
  ha_statistic_increment(&SSV::ha_read_rnd_next_count);
 
943
  ha_statistic_increment(&system_status_var::ha_read_rnd_next_count);
944
944
  current_position= aztell(&archive);
945
945
  rc= get_row(&archive, buf);
946
946
 
972
972
 
973
973
int ha_archive::rnd_pos(unsigned char * buf, unsigned char *pos)
974
974
{
975
 
  ha_statistic_increment(&SSV::ha_read_rnd_next_count);
 
975
  ha_statistic_increment(&system_status_var::ha_read_rnd_next_count);
976
976
  current_position= (internal::my_off_t)internal::my_get_ptr(pos, ref_length);
977
977
  if (azseek(&archive, (size_t)current_position, SEEK_SET) == (size_t)(-1L))
978
978
    return(HA_ERR_CRASHED_ON_USAGE);