← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/ut/ut0mem.c

  • Committer: Brian Aker
  • Date: 2010-12-25 00:28:49 UTC
  • mto: This revision was merged to the branch mainline in revision 2031.
  • Revision ID: brian@tangent.org-20101225002849-g73mg6ihulajis0o
First pass in refactoring of the name of my_decimal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/ut/ut0mem.c
229
229
Allocates memory. Sets it also to zero if UNIV_SET_MEM_TO_ZERO is
230
230
defined.
231
231
@return own: allocated memory */
232
 
extern "C"
233
232
UNIV_INTERN
234
233
void*
235
234
ut_malloc(
288
287
/**********************************************************************//**
289
288
Frees a memory block allocated with ut_malloc. Freeing a NULL pointer is
290
289
a nop. */
291
 
extern "C"
292
290
UNIV_INTERN
293
291
void
294
292
ut_free(
349
347
       original  block  is  left  untouched  - it is not freed or
350
348
       moved.
351
349
@return own: pointer to new mem block or NULL */
352
 
extern "C"
353
350
UNIV_INTERN
354
351
void*
355
352
ut_realloc(
598
595
                count = ut_strcount(str, s1);
599
596
        }
600
597
 
601
 
        new_str = static_cast<char *>(mem_alloc(str_len + count * len_delta + 1));
 
598
        new_str = mem_alloc(str_len + count * len_delta + 1);
602
599
        ptr = new_str;
603
600
 
604
601
        while (str) {