← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2010-10-15 03:36:56 UTC
  • mfrom: (1843.7.6 refactor)
  • Revision ID: brian@tangent.org-20101015033656-9u3aptcc6ipoc1vj
This removes two of our dead plugins (the bad schedulers).
Also this fixes help messages to say "schema" instead of "database"
everywhere..

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
1438
1438
{
1439
1439
  Session *tmp= NULL;
1440
1440
  uint32_t error= ER_NO_SUCH_THREAD;
1441
 
  LOCK_thread_count.lock(); // For unlink from list
1442
1441
  
1443
 
  for (SessionList::iterator it= getSessionList().begin(); it != getSessionList().end(); ++it )
1444
1442
  {
1445
 
    if ((*it)->thread_id == id)
 
1443
    boost::mutex::scoped_lock scoped(LOCK_thread_count);
 
1444
    for (SessionList::iterator it= getSessionList().begin(); it != getSessionList().end(); ++it )
1446
1445
    {
1447
 
      tmp= *it;
1448
 
      tmp->lockForDelete();
1449
 
      break;
 
1446
      if ((*it)->thread_id == id)
 
1447
      {
 
1448
        tmp= *it;
 
1449
        tmp->lockForDelete();
 
1450
        break;
 
1451
      }
1450
1452
    }
1451
1453
  }
1452
 
  LOCK_thread_count.unlock();
 
1454
 
1453
1455
  if (tmp)
1454
1456
  {
1455
1457