← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/thr_malloc.cc

  • Committer: Brian Aker
  • Date: 2008-08-07 16:29:49 UTC
  • mfrom: (264.1.20 codestyle)
  • Revision ID: brian@tangent.org-20080807162949-7o8eyjgdn8ms3n1a
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/thr_malloc.cc
16
16
 
17
17
/* Mallocs for used in threads */
18
18
 
19
 
#include "mysql_priv.h"
 
19
#include <drizzled/server_includes.h>
20
20
#include <drizzled/drizzled_error_messages.h>
21
 
#include <libdrizzle/gettext.h>
22
21
 
23
22
extern "C" {
24
23
  void sql_alloc_error_handler(void)
86
85
 
87
86
 
88
87
char *sql_strmake_with_convert(const char *str, size_t arg_length,
89
 
                               CHARSET_INFO *from_cs,
 
88
                               const CHARSET_INFO * const from_cs,
90
89
                               size_t max_res_length,
91
 
                               CHARSET_INFO *to_cs, size_t *result_length)
 
90
                               const CHARSET_INFO * const to_cs, size_t *result_length)
92
91
{
93
92
  char *pos;
94
93
  size_t new_length= to_cs->mbmaxlen*arg_length;