← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to plugin/csv/ha_tina.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/csv/ha_tina.cc
149
149
  /* Temp only engine, so do not return values. */
150
150
  void doGetTableNames(drizzled::CachedDirectory &, string& , set<string>&) { };
151
151
 
152
 
  int doDropTable(Session&, const string table_path);
 
152
  int doDropTable(Session&, const string &table_path);
153
153
  TinaShare *findOpenTable(const string table_name);
154
154
  void addOpenTable(const string &table_name, TinaShare *);
155
155
  void deleteOpenTable(const string &table_name);
161
161
};
162
162
 
163
163
int Tina::doDropTable(Session&,
164
 
                        const string table_path)
 
164
                        const string &table_path)
165
165
{
166
166
  int error= 0;
167
167
  int enoent_or_zero= ENOENT;                   // Error if no file was deleted
328
328
      meta-file in the end.
329
329
    */
330
330
    if ((share->meta_file= internal::my_open(meta_file_name,
331
 
                                   O_RDWR|O_CREAT, MYF(0))) == -1)
 
331
                                             O_RDWR|O_CREAT, MYF(0))) == -1)
332
332
      share->crashed= true;
333
333
 
334
334
    /*
937
937
  if (share->crashed)
938
938
      return(HA_ERR_CRASHED_ON_USAGE);
939
939
 
940
 
  ha_statistic_increment(&SSV::ha_write_count);
 
940
  ha_statistic_increment(&system_status_var::ha_write_count);
941
941
 
942
942
  size= encode_quote(buf);
943
943
 
995
995
  int size;
996
996
  int rc= -1;
997
997
 
998
 
  ha_statistic_increment(&SSV::ha_update_count);
 
998
  ha_statistic_increment(&system_status_var::ha_update_count);
999
999
 
1000
1000
  if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
1001
1001
    table->timestamp_field->set_time();
1037
1037
*/
1038
1038
int ha_tina::delete_row(const unsigned char *)
1039
1039
{
1040
 
  ha_statistic_increment(&SSV::ha_delete_count);
 
1040
  ha_statistic_increment(&system_status_var::ha_delete_count);
1041
1041
 
1042
1042
  if (chain_append())
1043
1043
    return(-1);
1145
1145
  if (share->crashed)
1146
1146
      return(HA_ERR_CRASHED_ON_USAGE);
1147
1147
 
1148
 
  ha_statistic_increment(&SSV::ha_read_rnd_next_count);
 
1148
  ha_statistic_increment(&system_status_var::ha_read_rnd_next_count);
1149
1149
 
1150
1150
  current_position= next_position;
1151
1151
 
1183
1183
 
1184
1184
int ha_tina::rnd_pos(unsigned char * buf, unsigned char *pos)
1185
1185
{
1186
 
  ha_statistic_increment(&SSV::ha_read_rnd_count);
 
1186
  ha_statistic_increment(&system_status_var::ha_read_rnd_count);
1187
1187
  current_position= (off_t)internal::my_get_ptr(pos,ref_length);
1188
1188
  return(find_current_row(buf));
1189
1189
}
1438
1438
  PLUGIN_LICENSE_GPL,
1439
1439
  tina_init_func, /* Plugin Init */
1440
1440
  tina_done_func, /* Plugin Deinit */
1441
 
  NULL,                       /* status variables                */
1442
1441
  NULL,                       /* system variables                */
1443
1442
  NULL                        /* config options                  */
1444
1443
}