← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/myxt_xt.cc

  • Committer: Brian Aker
  • Date: 2010-12-17 00:08:06 UTC
  • mfrom: (2002.1.4 clean)
  • Revision ID: brian@tangent.org-20101217000806-fa6kmggjnhsl4q85
Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/myxt_xt.cc
2200
2200
                        }
2201
2201
                }
2202
2202
 
2203
 
                seg->col_idx = field->field_index;
 
2203
                seg->col_idx = field->position();
2204
2204
                seg->is_recs_in_range = 1;
2205
2205
                seg->is_selectivity = 1;
2206
2206
                seg->type = (int) type;
2314
2314
                /* NOTE: do not set if the field is only partially in the index!!! */
2315
2315
                if (!partial_field)
2316
2316
#ifdef DRIZZLED
2317
 
                        MX_BIT_FAST_TEST_AND_SET(&mi_col_map, field->field_index);
 
2317
                        MX_BIT_FAST_TEST_AND_SET(&mi_col_map, field->position());
2318
2318
#else
2319
 
                        MX_BIT_FAST_TEST_AND_SET(&ind->mi_col_map, field->field_index);
 
2319
                        MX_BIT_FAST_TEST_AND_SET(&ind->mi_col_map, field->position());
2320
2320
#endif
2321
2321
        }
2322
2322
 
2440
2440
                for (key_part = index->key_part; key_part != key_part_end; key_part++) {
2441
2441
                        curr_field = key_part->field;
2442
2442
 
2443
 
                        if ((u_int) curr_field->field_index+1 > dic->dic_ind_cols_req)
2444
 
                                dic->dic_ind_cols_req = curr_field->field_index+1;
 
2443
                        if ((u_int) curr_field->position()+1 > dic->dic_ind_cols_req)
 
2444
                                dic->dic_ind_cols_req = curr_field->position()+1;
2445
2445
                }
2446
2446
        }
2447
2447
 
2478
2478
                                else
2479
2479
                                        max_ave_row_size = 200;
2480
2480
                                large_blob_field_count++;
2481
 
                                if ((u_int) curr_field->field_index+1 > dic->dic_blob_cols_req)
2482
 
                                        dic->dic_blob_cols_req = curr_field->field_index+1;
 
2481
                                if ((u_int) curr_field->position()+1 > dic->dic_blob_cols_req)
 
2482
                                        dic->dic_blob_cols_req = curr_field->position()+1;
2483
2483
                                dic->dic_blob_count++;
2484
2484
                                xt_realloc(self, (void **) &dic->dic_blob_cols, sizeof(Field *) * dic->dic_blob_count);
2485
2485
                                dic->dic_blob_cols[dic->dic_blob_count-1] = curr_field;