← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message.cc

  • Committer: Brian Aker
  • Date: 2011-01-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
23
#include <drizzled/show.h>
24
24
#include <drizzled/session.h>
25
 
#include <drizzled/schema.h>
 
25
#include <drizzled/db.h>
26
26
#include <drizzled/plugin/event_observer.h>
27
27
#include <drizzled/message.h>
28
28
 
29
 
#include <drizzled/message/table.pb.h>
30
 
#include <drizzled/message/schema.pb.h>
 
29
#include "drizzled/message/table.pb.h"
 
30
#include "drizzled/message/schema.pb.h"
31
31
 
32
32
#include <string>
33
33
 
75
75
static const std::string MATCH_PARTIAL("PARTIAL");
76
76
static const std::string MATCH_SIMPLE("SIMPLE");
77
77
 
78
 
const static std::string STANDARD_STRING("STANDARD");
79
 
const static std::string TEMPORARY_STRING("TEMPORARY");
80
 
const static std::string INTERNAL_STRING("INTERNAL");
81
 
const static std::string FUNCTION_STRING("FUNCTION");
82
 
 
83
78
void update(drizzled::message::Schema &arg)
84
79
{
85
80
  arg.set_version(arg.version() + 1);
252
247
  return MATCH_SIMPLE;
253
248
}
254
249
 
255
 
const std::string &type(drizzled::message::Table::TableType type)
256
 
{
257
 
  switch (type)
258
 
  {
259
 
  case message::Table::STANDARD:
260
 
    return STANDARD_STRING;
261
 
  case message::Table::TEMPORARY:
262
 
    return TEMPORARY_STRING;
263
 
  case message::Table::INTERNAL:
264
 
    return INTERNAL_STRING;
265
 
  case message::Table::FUNCTION:
266
 
    return FUNCTION_STRING;
267
 
  }
268
 
 
269
 
  assert(0);
270
 
  return PROGRAM_ERROR;
271
 
}
272
 
 
273
250
#if 0
274
251
std::ostream& operator<<(std::ostream& output, const message::Transaction &message)
275
252
{