← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/embedded_innodb/embedded_innodb_engine.cc

  • Committer: Brian Aker
  • Date: 2010-05-29 06:06:10 UTC
  • mfrom: (1574.1.8 new-staging)
  • Revision ID: brian@gir-20100529060610-phsss4stvg0uub22
Merge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/embedded_innodb/embedded_innodb_engine.cc
1742
1742
    doEndTableScan();
1743
1743
  in_table_scan= true;
1744
1744
 
1745
 
  if(*get_trx(current_session) == NULL)
1746
 
  {
1747
 
    EmbeddedInnoDBEngine *innodb_engine= static_cast<EmbeddedInnoDBEngine*>(engine);
1748
 
    innodb_engine->doStartTransaction(current_session, START_TRANS_NO_OPTIONS);
1749
 
  }
1750
 
 
1751
1745
  transaction= *get_trx(ha_session());
1752
1746
 
 
1747
  assert(transaction != NULL);
 
1748
 
1753
1749
  ib_cursor_attach_trx(cursor, transaction);
1754
1750
 
1755
1751
  tuple= ib_clust_read_tuple_create(cursor);
2009
2005
    ib_err_t err;
2010
2006
    ib_id_t index_id;
2011
2007
    err= ib_index_get_id(table_share->getPath()+2,
2012
 
                         table_share->key_info[keynr].name,
 
2008
                         table_share->getKeyInfo(keynr).name,
2013
2009
                         &index_id);
2014
2010
    if (err != DB_SUCCESS)
2015
2011
      return -1;
2196
2192
  /* works only with key prefixes */
2197
2193
  assert(((keypart_map_arg + 1) & keypart_map_arg) == 0);
2198
2194
 
2199
 
  KeyInfo *key_info_found= table->s->key_info + key_position;
2200
 
  KeyPartInfo *key_part_found= key_info_found->key_part;
2201
 
  KeyPartInfo *end_key_part_found= key_part_found + key_info_found->key_parts;
 
2195
  KeyPartInfo *key_part_found= table->s->getKeyInfo(key_position).key_part;
 
2196
  KeyPartInfo *end_key_part_found= key_part_found + table->s->getKeyInfo(key_position).key_parts;
2202
2197
  uint32_t length= 0;
2203
2198
 
2204
2199
  while (key_part_found < end_key_part_found && keypart_map_arg)