← 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: Brian Aker
  • Date: 2010-11-07 00:54:27 UTC
  • mfrom: (1909.1.2 merge)
  • Revision ID: brian@tangent.org-20101107005427-a3kcx1lytrm36a97
Rollup merge of iocache work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
1290
1290
/*=================*/
1291
1291
  void* mysql_session)  /*!< in: MySQL thread handle */
1292
1292
{
1293
 
  return session_charset(static_cast<Session*>(mysql_session));
 
1293
  return static_cast<Session*>(mysql_session)->charset();
1294
1294
}
1295
1295
 
1296
1296
extern "C" UNIV_INTERN
1805
1805
/*===============*/
1806
1806
  trx_t*  trx)  /*!< in: transaction */
1807
1807
{
1808
 
  return(trx && trx->mysql_thd && session_killed((Session*) trx->mysql_thd));
 
1808
  return(trx && trx->mysql_thd && static_cast<Session*>(trx->mysql_thd)->killed);
1809
1809
}
1810
1810
 
1811
1811
/**************************************************************//**