← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: lbieber
  • Date: 2010-10-01 13:06:31 UTC
  • mfrom: (1802.2.2 drizzle-bug-651948)
  • mto: This revision was merged to the branch mainline in revision 1805.
  • Revision ID: lbieber@orisndriz08-20101001130631-xubscnhmj7r5dn6g
Merge Andrew - Fix bug 651948 - Index lengths not retrieved using drizzledump

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/concat.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
121
121
          more than 25% of memory will be overcommitted on average.
122
122
        */
123
123
 
124
 
        size_t concat_len= res->length() + res2->length();
 
124
        uint32_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
 
      size_t concat_len= res->length() + sep_str->length() + res2->length();
 
294
      uint32_t concat_len= res->length() + sep_str->length() + res2->length();
295
295
 
296
296
      if (tmp_value.alloced_length() < concat_len)
297
297
      {