← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/concurrent.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 20:00:45 UTC
  • mto: (1921.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1916.
  • Revision ID: brian@tangent.org-20101108200045-wgysfvli5mtduszd
Enapsulate Kill.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/concurrent.cc
63
63
{
64
64
  safe_mutex_assert_owner(LOCK_open.native_handle());
65
65
 
66
 
  if (session->killed)
 
66
  if (session->getKilled())
67
67
    return true;
68
68
 
69
69
  TableIdentifier identifier(table_list->getSchemaName(), table_list->getTableName());
177
177
      /* Free share and wait until it's released by all threads */
178
178
      TableShare::release(share);
179
179
 
180
 
      if (!session->killed)
 
180
      if (not session->getKilled())
181
181
      {
182
182
        drizzle_reset_errors(session, 1);         // Clear warnings
183
183
        session->clear_error();                 // Clear error message