← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Olaf van der Spek
  • Date: 2011-04-14 21:56:22 UTC
  • mto: (2279.1.1 build) (2280.2.2 build)
  • mto: This revision was merged to the branch mainline in revision 2280.
  • Revision ID: olafvdspek@gmail.com-20110414215622-5b590ajxlwqqiyi0
Return void

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/make_set.cc
22
22
#include <drizzled/function/str/make_set.h>
23
23
#include <drizzled/session.h>
24
24
 
25
 
namespace drizzled
26
 
{
 
25
namespace drizzled {
27
26
 
28
27
void Item_func_make_set::update_used_tables()
29
28
{
96
95
        {
97
96
          if (result != &tmp_str)
98
97
          {                                     // Copy data to tmp_str
99
 
            if (tmp_str.alloc(result->length()+res->length()+1) ||
100
 
                tmp_str.copy(*result))
 
98
      tmp_str.alloc(result->length()+res->length()+1);
 
99
            if (tmp_str.copy(*result))
101
100
              return &my_empty_string;
102
101
            result= &tmp_str;
103
102
          }