← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/alloc_buffer.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/alloc_buffer.cc
21
21
 
22
22
#include <drizzled/function/str/alloc_buffer.h>
23
23
 
24
 
namespace drizzled
25
 
{
 
24
namespace drizzled {
26
25
 
27
26
String* alloc_buffer(String *res,String *str,String *tmp_value,
28
27
                            ulong length)
35
34
      str->length(length);
36
35
      return str;
37
36
    }
38
 
    if (tmp_value->alloc(length))
39
 
      return 0;
 
37
    tmp_value->alloc(length);
40
38
    (void) tmp_value->copy(*res);
41
39
    tmp_value->length(length);
42
40
    return tmp_value;