← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/second.cc

  • Committer: Jay Pipes
  • Date: 2009-01-29 20:12:20 UTC
  • mto: This revision was merged to the branch mainline in revision 820.
  • Revision ID: jpipes@serialcoder-20090129201220-rp759wpqwkl3x7rz
Quick fix for shadowing problem in second.cc

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/second.cc
51
51
   */
52
52
  drizzled::Time temporal_time;
53
53
  
54
 
  char buff[DRIZZLE_MAX_LENGTH_DATETIME_AS_STRING];
55
 
  String tmp(buff,sizeof(buff), &my_charset_utf8_bin);
56
 
  String *res= args[0]->val_str(&tmp);
57
 
  if (! temporal_time.from_string(res->c_ptr(), res->length()))
 
54
  char time_buff[DRIZZLE_MAX_LENGTH_DATETIME_AS_STRING];
 
55
  String tmp_time(time_buff,sizeof(time_buff), &my_charset_utf8_bin);
 
56
  String *time_res= args[0]->val_str(&tmp_time);
 
57
  if (! temporal_time.from_string(time_res->c_ptr(), time_res->length()))
58
58
  {
59
59
    /* 
60
60
     * OK, we failed to match the first argument as a string