← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Lee Bieber
  • Date: 2011-01-05 01:41:02 UTC
  • mfrom: (2054.1.2 clean)
  • Revision ID: kalebral@gmail.com-20110105014102-e1sfrth1cesuwyf7
Merge Brian - Rename of the Loooongggggg   error type over to simply drizzled::error_t
Merge Brian - Cleanup of error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
113
113
  if (var->check_type(type))
114
114
  {
115
115
    int err= type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : ER_GLOBAL_VARIABLE;
116
 
    my_error(err, MYF(0), var->getName().c_str());
 
116
    my_error(static_cast<drizzled::error_t>(err), MYF(0), var->getName().c_str());
117
117
    return -1;
118
118
  }
119
119
  /* value is a NULL pointer if we are using SET ... = DEFAULT */