← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/thr_malloc.cc

  • Committer: Monty Taylor
  • Date: 2008-08-02 01:03:15 UTC
  • mto: (236.1.42 codestyle)
  • mto: This revision was merged to the branch mainline in revision 261.
  • Revision ID: monty@inaugust.com-20080802010315-65h5938pymg9d99z
Moved m4 macros to top-level m4 dir, per GNU standards (and where gettext wanted it :)

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