← 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-06-11 17:53:40 UTC
  • mfrom: (1608.1.3 build)
  • Revision ID: brian@gaz-20100611175340-9ok4r35ait2sb2de
Rollup merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
730
730
                                 session->thread_id,
731
731
                                 const_cast<const char *>(session->db.empty() ? "" : session->db.c_str()));
732
732
        /* Actually execute the query */
733
 
        mysql_execute_command(session);
 
733
        try {
 
734
          mysql_execute_command(session);
 
735
        }
 
736
        catch (...)
 
737
        {
 
738
          // Just try to catch any random failures that could have come
 
739
          // during execution.
 
740
        }
734
741
        DRIZZLE_QUERY_EXEC_DONE(0);
735
742
      }
736
743
    }
744
751
  session->set_proc_info("freeing items");
745
752
  session->end_statement();
746
753
  session->cleanup_after_query();
747
 
 
748
 
  return;
749
754
}
750
755
 
751
756