← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/concat.cc

  • Committer: Brian Aker
  • Date: 2010-10-06 18:16:00 UTC
  • mto: (1818.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1819.
  • Revision ID: brian@tangent.org-20101006181600-q7zuzw31zlq030ra
Convert sql_string to use size_t (this should clean up ICC warnings).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/concat.cc
121
121
          more than 25% of memory will be overcommitted on average.
122
122
        */
123
123
 
124
 
        uint32_t concat_len= res->length() + res2->length();
 
124
        size_t concat_len= res->length() + res2->length();
125
125
 
126
126
        if (tmp_value.alloced_length() < concat_len)
127
127
        {
291
291
        25% of memory will be overcommitted on average.
292
292
      */
293
293
 
294
 
      uint32_t concat_len= res->length() + sep_str->length() + res2->length();
 
294
      size_t concat_len= res->length() + sep_str->length() + res2->length();
295
295
 
296
296
      if (tmp_value.alloced_length() < concat_len)
297
297
      {