← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Lee Bieber
  • Date: 2011-01-04 18:54:52 UTC
  • mfrom: (2053.1.2 build)
  • Revision ID: kalebral@gmail.com-20110104185452-hnf41sloyoeh2e3a
Merge Joe - fix bug 696397: innodb storing bin log offset in trx sys header
Merge Monty - provide general abort exception to work along side BOOST_THROW_EXCEPTION

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
2599
2599
      }
2600
2600
    }
2601
2601
 
2602
 
                /* Store transaction point for binlog
2603
 
    Later logic tests that this is set to _something_. We need
2604
 
    that logic to fire, even though we do not have a real name. */
2605
 
    trx->mysql_log_file_name = "UNUSED";
 
2602
    trx->mysql_log_file_name = NULL;
2606
2603
    trx->mysql_log_offset = 0;
2607
2604
 
2608
2605
    /* Don't do write + flush right now. For group commit