← 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-05-13 07:52:42 UTC
  • mfrom: (1527.1.4 staging)
  • Revision ID: brian@gaz-20100513075242-gyzfi5c4nb9x4919
Merge of TableShare keynames typelib removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1958
1958
                                       &error)))
1959
1959
    return 1;
1960
1960
 
1961
 
  while ((error= open_table_from_share(session, share, alias,
1962
 
                                       (uint32_t) (HA_OPEN_KEYFILE |
1963
 
                                                   HA_OPEN_RNDFILE |
1964
 
                                                   HA_GET_INDEX |
1965
 
                                                   HA_TRY_READ_ONLY),
1966
 
                                       session->open_options, *entry)))
 
1961
  while ((error= share->open_table_from_share(session, alias,
 
1962
                                              (uint32_t) (HA_OPEN_KEYFILE |
 
1963
                                                          HA_OPEN_RNDFILE |
 
1964
                                                          HA_GET_INDEX |
 
1965
                                                          HA_TRY_READ_ONLY),
 
1966
                                              session->open_options, *entry)))
1967
1967
  {
1968
1968
    if (error == 7)                             // Table def changed
1969
1969
    {
2307
2307
  /*
2308
2308
    First open the share, and then open the table from the share we just opened.
2309
2309
  */
2310
 
  if (open_table_def(*this, identifier, share) ||
2311
 
      open_table_from_share(this, share, identifier.getTableName().c_str(),
 
2310
  if (share->open_table_def(*this, identifier) ||
 
2311
      share->open_table_from_share(this, identifier.getTableName().c_str(),
2312
2312
                            (uint32_t) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
2313
2313
                                        HA_GET_INDEX),
2314
2314
                            ha_open_options,
2497
2497
        field_ptr points to field in TableShare. Convert it to the matching
2498
2498
        field in table
2499
2499
      */
2500
 
      field_ptr= (table->field + (field_ptr - table->s->field));
 
2500
      field_ptr= (table->field + (field_ptr - table->s->getFields()));
2501
2501
    }
2502
2502
  }
2503
2503
  else