← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/blitzdb/ha_blitz.cc

  • Committer: Lee Bieber
  • Date: 2011-02-10 21:02:41 UTC
  • mfrom: (2154.1.3 build)
  • Revision ID: kalebral@gmail.com-20110210210241-jouae2uw2pwv6bac
Merge Patrick - 715885: dbqp needs to return non-zero if tests fail
Merge Stewart - 715539: (get|set)_session_proc_info() still exists
Merge Stewart - 715575: misc session_foo() functions exist - should be methods in Session
Merge Stewart - 712843: SAVEPOINT after rollback due to deadlock with autocommit=off in transaction will call startTransaction with an existing transaction where one shouldn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/blitzdb/ha_blitz.cc
497
497
 
498
498
int ha_blitz::doStartTableScan(bool scan) {
499
499
  /* Obtain the query type for this scan */
500
 
  sql_command_type = session_sql_command(getTable()->getSession());
 
500
  sql_command_type = getTable()->getSession()->getSqlCommand();
501
501
  table_scan = scan;
502
502
  table_based = true;
503
503
 
622
622
 
623
623
int ha_blitz::doStartIndexScan(uint32_t key_num, bool) {
624
624
  active_index = key_num;
625
 
  sql_command_type = session_sql_command(getTable()->getSession());
 
625
  sql_command_type = getTable()->getSession()->getSqlCommand();
626
626
 
627
627
  /* This is unlikely to happen but just for assurance, re-obtain
628
628
     the lock if this thread already has a certain lock. This makes