← Back to branch summary

~linuxjedi/drizzle/trunk-drizzledump-bugs-part2

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Andrew Hutchings
  • Date: 2010-12-08 07:35:23 UTC
  • mfrom: (1976.2.4 staging)
  • Revision ID: andrew@linuxjedi.co.uk-20101208073523-dokhzgnisocljo2k
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
88
88
extern const CHARSET_INFO *character_set_filesystem;
89
89
extern size_t my_thread_stack_size;
90
90
 
91
 
class sys_var_pluginvar;
92
91
typedef map<string, sys_var *> SystemVariableMap;
93
92
static SystemVariableMap system_variable_map;
94
93
extern char *opt_drizzle_tmpdir;
321
320
/* Global read-only variable containing hostname */
322
321
static sys_var_const_str        sys_hostname("hostname", glob_hostname);
323
322
 
324
 
bool sys_var::check(Session *, set_var *var)
 
323
bool sys_var::check(Session *session, set_var *var)
325
324
{
 
325
  if (check_func)
 
326
  {
 
327
    int res;
 
328
    if ((res=(*check_func)(session, var)) < 0)
 
329
      my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), getName().c_str(), var->value->str_value.ptr());
 
330
    return res;
 
331
  }
326
332
  var->save_result.uint64_t_value= var->value->val_int();
327
333
  return 0;
328
334
}
329
335
 
330
336
bool sys_var_str::check(Session *session, set_var *var)
331
337
{
 
338
  if (!check_func)
 
339
    return 0;
 
340
 
332
341
  int res;
333
 
  if (!check_func)
334
 
    return 0;
335
 
 
336
342
  if ((res=(*check_func)(session, var)) < 0)
337
343
    my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), getName().c_str(), var->value->str_value.ptr());
338
344
  return res;