← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/thr_malloc.cc

  • Committer: Stewart Smith
  • Date: 2008-09-15 07:13:59 UTC
  • mfrom: (383.1.21 drizzle)
  • mto: This revision was merged to the branch mainline in revision 408.
  • Revision ID: stewart@flamingspork.com-20080915071359-f8bznznyaiqrtqxa
merged

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
#include <drizzled/drizzled_error_messages.h>
20
21
 
21
22
extern "C" {
22
23
  void sql_alloc_error_handler(void)
84
85
 
85
86
 
86
87
char *sql_strmake_with_convert(const char *str, size_t arg_length,
87
 
                               CHARSET_INFO *from_cs,
 
88
                               const CHARSET_INFO * const from_cs,
88
89
                               size_t max_res_length,
89
 
                               CHARSET_INFO *to_cs, size_t *result_length)
 
90
                               const CHARSET_INFO * const to_cs, size_t *result_length)
90
91
{
91
92
  char *pos;
92
93
  size_t new_length= to_cs->mbmaxlen*arg_length;