← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Lee Bieber
  • Date: 2010-11-23 05:05:31 UTC
  • mfrom: (1945.1.8 bug675670)
  • Revision ID: kalebral@gmail.com-20101123050531-sf6ma8he7s47yryd
Merge Monty - fix bug 675670: Drizzle falsely reporting conflicts with tmp/mysql.socket but starts normally

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
338
338
  return res;
339
339
}
340
340
 
 
341
bool sys_var_std_string::check(Session *session, set_var *var)
 
342
{
 
343
  if (check_func == NULL)
 
344
  {
 
345
    return false;
 
346
  }
 
347
 
 
348
  int res= (*check_func)(session, var);
 
349
  if (res != 0)
 
350
  {
 
351
    my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), getName().c_str(), var->value->str_value.ptr());
 
352
    return true;
 
353
  }
 
354
  return false;
 
355
}
 
356
 
341
357
/*
342
358
  Functions to check and update variables
343
359
*/