← 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-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/execute.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
 
#include <drizzled/session.h>
24
 
#include <drizzled/user_var_entry.h>
25
 
#include <drizzled/plugin/client/concurrent.h>
26
 
#include <drizzled/catalog/local.h>
27
 
#include <drizzled/execute.h>
 
23
#include "drizzled/session.h"
 
24
#include "drizzled/user_var_entry.h"
 
25
#include "drizzled/plugin/client/concurrent.h"
 
26
#include "drizzled/catalog/local.h"
 
27
#include "drizzled/execute.h"
28
28
 
29
29
namespace drizzled
30
30
{
85
85
  if (wait && thread && thread->joinable())
86
86
  {
87
87
    // We want to make sure that we can be killed
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
 
    {
 
88
    boost::this_thread::restore_interruption dl(_session.getThreadInterupt());
 
89
    try {
104
90
      thread->join();
105
91
    }
 
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
    }
106
99
  }
107
100
}
108
101