← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2010-06-03 22:55:32 UTC
  • mto: (1578.6.9 explain-drizzle)
  • mto: This revision was merged to the branch mainline in revision 1591.
  • Revision ID: brian@gir-2.local-20100603225532-5yuc8um41i4owavf
Additional pass through to remove raw field access.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
2496
2496
  if (cached_field_index < table->getShare()->sizeFields() &&
2497
2497
      !my_strcasecmp(system_charset_info,
2498
2498
                     table->field[cached_field_index]->field_name, name))
 
2499
  {
2499
2500
    field_ptr= table->field + cached_field_index;
 
2501
  }
2500
2502
  else if (table->getShare()->name_hash.records)
2501
2503
  {
2502
2504
    field_ptr= (Field**) hash_search(&table->getShare()->name_hash, (unsigned char*) name,
2507
2509
        field_ptr points to field in TableShare. Convert it to the matching
2508
2510
        field in table
2509
2511
      */
2510
 
      field_ptr= (table->field + (field_ptr - table->getMutableShare()->getFields()));
 
2512
      field_ptr= (table->field + (field_ptr - (table->getMutableShare()->getFields(true))));
2511
2513
    }
2512
2514
  }
2513
2515
  else