← Back to branch summary

~jaypipes/drizzle/split-xa-resource-manager

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Jay Pipes
  • Date: 2010-02-06 01:51:20 UTC
  • mfrom: (1273.1.10 build)
  • Revision ID: jpipes@serialcoder-20100206015120-as4vb638inbzrb59
Merge trunk changes and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
52
52
#include <drizzled/plugin/client.h>
53
53
 
54
54
using namespace std;
55
 
using namespace drizzled;
 
55
 
 
56
namespace drizzled
 
57
{
56
58
 
57
59
/*
58
60
  Store a new message in an error object
241
243
  session->my_eof();
242
244
  return(false);
243
245
}
 
246
 
 
247
} /* namespace drizzled */