← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge of Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
3554
3554
                        prebuilt->templ_contains_blob = TRUE;
3555
3555
                }
3556
3556
skip_field:
3557
 
                innodb_idx++;
 
3557
                innodb_idx++;
3558
3558
                if (need_second_pass && (sql_idx+1 == n_fields))
3559
3559
                {
3560
3560
                  prebuilt->n_index_fields= n_requested_fields;
4137
4137
                                &prebuilt->table->cols[innodb_idx], clust_index);
4138
4138
                        n_changed++;
4139
4139
                }
4140
 
                innodb_idx++;
 
4140
                innodb_idx++;
4141
4141
        }
4142
4142
 
4143
4143
        uvect->n_fields = n_changed;