← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/catalog.cc

  • Committer: Brian Aker
  • Date: 2011-01-01 01:13:51 UTC
  • mto: (2060.4.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2073.
  • Revision ID: brian@tangent.org-20110101011351-07k85on7vvy33cwi
Update so that CATALOG is correctly being displayed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/catalog.cc
22
22
 
23
23
#include "drizzled/plugin/catalog.h"
24
24
#include "drizzled/catalog/cache.h"
 
25
#include "drizzled/catalog/local.h"
25
26
#include "drizzled/error.h"
26
27
 
27
28
#include <boost/foreach.hpp>
90
91
 
91
92
bool Catalog::drop(const identifier::Catalog &identifier)
92
93
{
93
 
  static drizzled::identifier::Catalog LOCAL_IDENTIFIER("local");
94
 
  if (identifier == LOCAL_IDENTIFIER)
 
94
  if (identifier == drizzled::catalog::local_identifier())
95
95
  {
96
96
    my_error(drizzled::ER_CATALOG_NO_DROP_LOCAL, MYF(0));
97
97
    return false;