← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Monty Taylor
  • Date: 2009-02-21 01:15:13 UTC
  • mto: (892.1.5 devel)
  • mto: This revision was merged to the branch mainline in revision 898.
  • Revision ID: mordred@inaugust.com-20090221011513-c3jq8dfaiboc64cl
More solaris warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
701
701
    var->save_result.uint64_t_value= (size_t) var->value->val_int();
702
702
  else
703
703
  {
704
 
    ssize_t v= var->value->val_int();
 
704
    ssize_t v= (ssize_t)var->value->val_int();
705
705
    var->save_result.uint64_t_value= (size_t) ((v < 0) ? 0 : v);
706
706
  }
707
707
  return 0;
769
769
{
770
770
  bool not_used;
771
771
  pthread_mutex_lock(&LOCK_global_system_variables);
772
 
  *value= getopt_ull_limit_value((uint32_t) option_limits->def_value,
773
 
                                 option_limits, &not_used);
 
772
  *value= (uint32_t)getopt_ull_limit_value((uint32_t) option_limits->def_value,
 
773
                                           option_limits, &not_used);
774
774
  pthread_mutex_unlock(&LOCK_global_system_variables);
775
775
}
776
776
 
1051
1051
    bool not_used;
1052
1052
    pthread_mutex_lock(&LOCK_global_system_variables);
1053
1053
    global_system_variables.*offset=
1054
 
      getopt_ull_limit_value((size_t) option_limits->def_value,
1055
 
                             option_limits, &not_used);
 
1054
      (size_t)getopt_ull_limit_value((size_t) option_limits->def_value,
 
1055
                                     option_limits, &not_used);
1056
1056
    pthread_mutex_unlock(&LOCK_global_system_variables);
1057
1057
  }
1058
1058
  else
2584
2584
                                                           const LEX_STRING *)
2585
2585
{
2586
2586
  LEX_STRING opts;
2587
 
  uint64_t val= ((type == OPT_GLOBAL) ? global_system_variables.*offset :
 
2587
  uint32_t val= ((type == OPT_GLOBAL) ? global_system_variables.*offset :
2588
2588
                  session->variables.*offset);
2589
2589
  (void) symbolic_mode_representation(session, val, &opts);
2590
2590
  return (unsigned char *) opts.str;