← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.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/sql_base.cc
93
93
  By leaving the table in the table cache, it disallows any other thread
94
94
  to open the table
95
95
 
96
 
  session->killed will be set if we run out of memory
 
96
  session->getKilled() will be set if we run out of memory
97
97
 
98
98
  If closing a MERGE child, the calling function has to take care for
99
99
  closing the parent too, if necessary.
258
258
 
259
259
      bool found= true;
260
260
      /* Wait until all threads has closed all the tables we had locked */
261
 
      while (found && ! session->killed)
 
261
      while (found && ! session->getKilled())
262
262
      {
263
263
        found= false;
264
264
        for (table::CacheMap::const_iterator iter= table::getCache().begin();
766
766
      mutex is unlocked
767
767
    */
768
768
    boost_unique_lock_t scopedLock(mutex, boost::adopt_lock_t());
769
 
    if (not killed)
 
769
    if (not getKilled())
770
770
    {
771
771
      cond.wait(scopedLock);
772
772
    }
909
909
  if (check_stack_overrun(this, STACK_MIN_SIZE_FOR_OPEN, (unsigned char *)&alias))
910
910
    return NULL;
911
911
 
912
 
  if (killed)
 
912
  if (getKilled())
913
913
    return NULL;
914
914
 
915
915
  TableIdentifier identifier(table_list->getSchemaName(), table_list->getTableName());
1446
1446
  session->set_proc_info("Waiting for tables");
1447
1447
  {
1448
1448
    boost_unique_lock_t lock(LOCK_open);
1449
 
    while (!session->killed)
 
1449
    while (not session->getKilled())
1450
1450
    {
1451
1451
      session->some_tables_deleted= false;
1452
1452
      session->close_old_data_files(false, dropping_tables != 0);
1456
1456
      }
1457
1457
      COND_refresh.wait(lock);
1458
1458
    }
1459
 
    if (session->killed)
 
1459
    if (session->getKilled())
1460
1460
      result= true;                                     // aborted
1461
1461
    else
1462
1462
    {