← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
1020
1020
    }
1021
1021
 
1022
1022
    var->save_result.uint32_t_value= ((uint32_t)
1023
 
                                   find_set(enum_names, res->c_ptr(),
1024
 
                                            res->length(),
1025
 
                                            NULL,
1026
 
                                            &error, &error_len,
1027
 
                                            &not_used));
 
1023
                                      find_set(enum_names, res->c_ptr(),
 
1024
                                               res->length(),
 
1025
                                               NULL,
 
1026
                                               &error, &error_len,
 
1027
                                               &not_used));
1028
1028
    if (error_len)
1029
1029
    {
1030
 
      size_t len = cmin(sizeof(buff) - 1, error_len);
 
1030
      size_t len = min((uint32_t)(sizeof(buff) - 1), error_len);
1031
1031
      strncpy(buff, error, len);
1032
1032
      buff[len]= '\0';
1033
1033
      goto err;