← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/page/page0cur.c

  • Committer: Brian Aker
  • Date: 2010-10-06 18:16:00 UTC
  • mto: (1818.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1819.
  • Revision ID: brian@tangent.org-20101006181600-q7zuzw31zlq030ra
Convert sql_string to use size_t (this should clean up ICC warnings).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/page/page0cur.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1994, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
879
879
        if (mismatch_index + end_seg_len < sizeof buf1) {
880
880
                buf = buf1;
881
881
        } else {
882
 
                buf = static_cast<byte *>(mem_alloc(mismatch_index + end_seg_len));
 
882
                buf = mem_alloc(mismatch_index + end_seg_len);
883
883
        }
884
884
 
885
885
        /* Build the inserted record to buf */
1195
1195
        }
1196
1196
 
1197
1197
        /* Out of space: restore the page */
1198
 
        if (!page_zip_decompress(page_zip, page, FALSE)) {
 
1198
        if (!page_zip_decompress(page_zip, page)) {
1199
1199
                ut_error; /* Memory corrupted? */
1200
1200
        }
1201
1201
        ut_ad(page_validate(page, index));