← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.cc

  • Committer: Diego Medina
  • Date: 2009-09-15 02:21:15 UTC
  • mto: This revision was merged to the branch mainline in revision 1136.
  • Revision ID: diego.medina@sun.com-20090915022115-u0s94dg8j9m9fezy
reverted transaction_prealloc_size to an uint32_t
fixed test case

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
22
22
#include <drizzled/session.h>
23
23
#include <drizzled/error.h>
24
24
#include <drizzled/item/string.h>
25
25
 
26
 
namespace drizzled
27
 
{
28
 
 
29
26
Item *Item_string::safe_charset_converter(const CHARSET_INFO * const tocs)
30
27
{
31
28
  Item_string *conv;
32
 
  size_t conv_errors;
 
29
  uint32_t conv_errors;
33
30
  char *ptr;
34
31
  String tmp, cstr, *ostr= val_str(&tmp);
35
32
  cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
57
54
Item *Item_static_string_func::safe_charset_converter(const CHARSET_INFO * const tocs)
58
55
{
59
56
  Item_string *conv;
60
 
  size_t conv_errors;
 
57
  uint32_t conv_errors;
61
58
  String tmp, cstr, *ostr= val_str(&tmp);
62
59
  cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
63
60
  if (conv_errors ||
175
172
}
176
173
 
177
174
 
178
 
} /* namespace drizzled */
 
175