← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Monty Taylor
  • Date: 2010-12-26 00:22:34 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226002234-2sb62sm2gs0iftuy
Fixing some of the innodb c++ casting issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/ut/ut0mem.cc
598
598
                count = ut_strcount(str, s1);
599
599
        }
600
600
 
601
 
        new_str = mem_alloc(str_len + count * len_delta + 1);
 
601
        new_str = static_cast<char *>(mem_alloc(str_len + count * len_delta + 1));
602
602
        ptr = new_str;
603
603
 
604
604
        while (str) {