← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/data0data.ic

  • Committer: lbieber
  • Date: 2010-10-05 22:23:12 UTC
  • mfrom: (1813.1.4 build)
  • Revision ID: lbieber@orisndriz08-20101005222312-weuq0ardk3gcryau
Merge Travis - 621861 - convert structs to classes
Merge Billy - 621331 - Replace use of stringstream with boost::lexical_cast
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle
Merge Andrew - fix bug 653300 - Syntax error on inport of a SQL file produced by drizzledump

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/data0data.ic
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
518
518
        ulint           n_fields,/*!< in: number of complete fields to fold */
519
519
        ulint           n_bytes,/*!< in: number of bytes to fold in an
520
520
                                incomplete last field */
521
 
        index_id_t      tree_id)/*!< in: index tree id */
 
521
        dulint          tree_id)/*!< in: index tree id */
522
522
{
523
523
        const dfield_t* field;
524
524
        ulint           i;
530
530
        ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N);
531
531
        ut_ad(dtuple_check_typed(tuple));
532
532
 
533
 
        fold = ut_fold_ull(tree_id);
 
533
        fold = ut_fold_dulint(tree_id);
534
534
 
535
535
        for (i = 0; i < n_fields; i++) {
536
536
                field = dtuple_get_nth_field(tuple, i);