← 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: 2009-04-07 18:50:18 UTC
  • mfrom: (977 drizzle)
  • mto: (992.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 978.
  • Revision ID: mordred@inaugust.com-20090407185018-bf2zxhfz0y4jyeia
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/thr_malloc.cc
30
30
void init_sql_alloc(MEM_ROOT *mem_root, size_t block_size, size_t pre_alloc)
31
31
{
32
32
  init_alloc_root(mem_root, block_size, pre_alloc);
33
 
  mem_root->error_handler=sql_alloc_error_handler;
 
33
  mem_root->error_handler= sql_alloc_error_handler;
34
34
}
35
35
 
36
36
 
80
80
  return pos;
81
81
}
82
82
 
83
 
void sql_element_free(void *)
84
 
{} /* purecov: deadcode */
85
 
 
86
 
 
87
 
 
88
83
char *sql_strmake_with_convert(const char *str, size_t arg_length,
89
84
                               const CHARSET_INFO * const from_cs,
90
85
                               size_t max_res_length,