← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drizzled/foreign_key.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/foreign_key.cc
26
26
#include "drizzled/create_field.h"
27
27
#include "drizzled/internal/my_sys.h"
28
28
 
29
 
using namespace drizzled;
 
29
namespace drizzled
 
30
{
30
31
 
31
32
extern const CHARSET_INFO *system_charset_info;
32
33
 
136
137
  return false;
137
138
}
138
139
 
139
 
 
140
 
 
 
140
} /* namespace drizzled */