← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2011-04-17 02:05:51 UTC
  • mfrom: (2279.1.3 build)
  • Revision ID: kalebral@gmail.com-20110417020551-59m0hx1p10b0up1x
Merge Joe - 760367: DATA_DICTIONARY.CUMULATIVE_USER_STATS.CONNECTED_TIME_SEC reports bogus results
Merge Olaf - Refactor Catalog Cache
Merge Olaf - Delete unused functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/concat.cc
127
127
        {
128
128
          if (tmp_value.alloced_length() == 0)
129
129
          {
130
 
            if (tmp_value.alloc(concat_len))
131
 
              goto null;
 
130
            tmp_value.alloc(concat_len);
132
131
          }
133
132
          else
134
133
          {
297
296
      {
298
297
        if (tmp_value.alloced_length() == 0)
299
298
        {
300
 
          if (tmp_value.alloc(concat_len))
301
 
            goto null;
 
299
          tmp_value.alloc(concat_len);
302
300
        }
303
301
        else
304
302
        {