← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Lee Bieber
  • Date: 2011-01-04 18:54:52 UTC
  • mfrom: (2053.1.2 build)
  • Revision ID: kalebral@gmail.com-20110104185452-hnf41sloyoeh2e3a
Merge Joe - fix bug 696397: innodb storing bin log offset in trx sys header
Merge Monty - provide general abort exception to work along side BOOST_THROW_EXCEPTION

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
17
17
 
18
18
#define DRIZZLE_LEX 1
19
19
 
 
20
#include "drizzled/abort_exception.h"
20
21
#include <drizzled/my_hash.h>
21
22
#include <drizzled/error.h>
22
23
#include <drizzled/nested_join.h>
753
754
        {
754
755
          // Just try to catch any random failures that could have come
755
756
          // during execution.
756
 
          unireg_abort(1);
 
757
          DRIZZLE_ABORT;
757
758
        }
758
759
        DRIZZLE_QUERY_EXEC_DONE(0);
759
760
      }