← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Monty Taylor
  • Date: 2009-05-09 22:26:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1009.
  • Revision ID: mordred@inaugust.com-20090509222607-wjjid9t0x0dbgagp
Removed is_stored - was only used for VCOL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
3453
3453
        for (sql_idx = 0; sql_idx < n_fields; sql_idx++) {
3454
3454
                templ = prebuilt->mysql_template + n_requested_fields;
3455
3455
                field = table->field[sql_idx];
3456
 
                if (!field->is_stored)
3457
 
                       goto skip_field;
3458
3456
 
3459
3457
                if (UNIV_LIKELY(templ_type == ROW_MYSQL_REC_FIELDS)) {
3460
3458
                        /* Decide which columns we should fetch
3557
3555
                        prebuilt->templ_contains_blob = TRUE;
3558
3556
                }
3559
3557
skip_field:
3560
 
                if (field->is_stored)
3561
 
                {
3562
 
                  innodb_idx++;
3563
 
                }
 
3558
                innodb_idx++;
3564
3559
                if (need_second_pass && (sql_idx+1 == n_fields))
3565
3560
                {
3566
3561
                  prebuilt->n_index_fields= n_requested_fields;
4049
4044
 
4050
4045
        for (sql_idx = 0; sql_idx < n_fields; sql_idx++) {
4051
4046
                field = table->field[sql_idx];
4052
 
                if (!field->is_stored)
4053
 
                  continue;
4054
4047
 
4055
4048
                o_ptr = (const byte*) old_row + get_field_offset(table, field);
4056
4049
                n_ptr = (const byte*) new_row + get_field_offset(table, field);
4145
4138
                                &prebuilt->table->cols[innodb_idx], clust_index);
4146
4139
                        n_changed++;
4147
4140
                }
4148
 
                if (field->is_stored)
4149
 
                  innodb_idx++;
 
4141
                innodb_idx++;
4150
4142
        }
4151
4143
 
4152
4144
        uvect->n_fields = n_changed;
5138
5130
 
5139
5131
        for (i = 0; i < n_cols; i++) {
5140
5132
                field = form->field[i];
5141
 
                if (!field->is_stored)
5142
 
                  continue;
5143
5133
 
5144
5134
                col_type = get_innobase_type_from_mysql_type(&unsigned_type,
5145
5135
                                                                        field);