← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/execute.cc

  • Committer: Brian Aker
  • Date: 2011-01-24 00:14:21 UTC
  • mfrom: (2081.4.1 clean)
  • Revision ID: brian@tangent.org-20110124001421-eys9bolq0zng6fs2
Merge in trunk of bootstrap treee.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/execute.cc
85
85
  if (wait && thread && thread->joinable())
86
86
  {
87
87
    // We want to make sure that we can be killed
88
 
    boost::this_thread::restore_interruption dl(_session.getThreadInterupt());
89
 
    try {
 
88
    if (_session.getThread())
 
89
    {
 
90
      boost::this_thread::restore_interruption dl(_session.getThreadInterupt());
 
91
 
 
92
      try {
 
93
        thread->join();
 
94
      }
 
95
      catch(boost::thread_interrupted const&)
 
96
      {
 
97
        // Just surpress and return the error
 
98
        my_error(drizzled::ER_QUERY_INTERRUPTED, MYF(0));
 
99
        return;
 
100
      }
 
101
    }
 
102
    else
 
103
    {
90
104
      thread->join();
91
105
    }
92
 
    catch(boost::thread_interrupted const&)
93
 
    {
94
 
      // Just surpress and return the error
95
 
      my_error(drizzled::ER_QUERY_INTERRUPTED, MYF(0));
96
 
 
97
 
      return;
98
 
    }
99
106
  }
100
107
}
101
108