← 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-03-23 22:06:38 UTC
  • mfrom: (2246.3.6 yesthrow)
  • mto: This revision was merged to the branch mainline in revision 2248.
  • Revision ID: kalebral@gmail.com-20110323220638-fsfah5cip0v61koq
Merge Olaf - Remove std::nothrow from new()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
236
236
 
237
237
int set_var_user::update(Session *)
238
238
{
239
 
  if (user_var_item->update())
240
 
  {
241
 
    /* Give an error if it's not given already */
242
 
    my_message(ER_SET_CONSTANTS_ONLY, ER(ER_SET_CONSTANTS_ONLY), MYF(0));
243
 
    return -1;
244
 
  }
245
 
  return 0;
 
239
  user_var_item->update();
 
240
        return 0;
246
241
}
247
242
 
248
243
void set_var::setValue(const std::string &new_value)