← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

Reverted changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1964
1964
                                             &error)))
1965
1965
    return 1;
1966
1966
 
1967
 
  while ((error= share->open_table_from_share(session, alias,
 
1967
  while ((error= share->open_table_from_share(session,
 
1968
                                              identifier,
 
1969
                                              alias,
1968
1970
                                              (uint32_t) (HA_OPEN_KEYFILE |
1969
1971
                                                          HA_OPEN_RNDFILE |
1970
1972
                                                          HA_GET_INDEX |
2313
2315
    First open the share, and then open the table from the share we just opened.
2314
2316
  */
2315
2317
  if (share->open_table_def(*this, identifier) ||
2316
 
      share->open_table_from_share(this, identifier.getTableName().c_str(),
 
2318
      share->open_table_from_share(this, identifier, identifier.getTableName().c_str(),
2317
2319
                            (uint32_t) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
2318
2320
                                        HA_GET_INDEX),
2319
2321
                            ha_open_options,