← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Olaf van der Spek
  • Date: 2011-05-05 11:49:51 UTC
  • mto: This revision was merged to the branch mainline in revision 2306.
  • Revision ID: olafvdspek@gmail.com-20110505114951-tt45awrgnmkepvuf
Return void

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/concat.cc
129
129
          {
130
130
            uint32_t new_len= max(tmp_value.alloced_length() * 2, concat_len);
131
131
 
132
 
            if (tmp_value.realloc(new_len))
133
 
              goto null;
 
132
            tmp_value.realloc(new_len);
134
133
          }
135
134
        }
136
135
 
296
295
        {
297
296
          uint32_t new_len= max(tmp_value.alloced_length() * 2, concat_len);
298
297
 
299
 
          if (tmp_value.realloc(new_len))
300
 
            goto null;
 
298
          tmp_value.realloc(new_len);
301
299
        }
302
300
      }
303
301