← 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-01-12 00:55:03 UTC
  • mfrom: (1259.5.16 kill-frm-mention)
  • Revision ID: brian@gaz-20100112005503-j92e68kvwkxol6ay
Merge Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1960
1960
                                                   HA_OPEN_RNDFILE |
1961
1961
                                                   HA_GET_INDEX |
1962
1962
                                                   HA_TRY_READ_ONLY),
1963
 
                                       (EXTRA_RECORD),
1964
1963
                                       session->open_options, entry)))
1965
1964
  {
1966
1965
    if (error == 7)                             // Table def changed
2302
2301
      open_table_from_share(this, share, identifier.getTableName(),
2303
2302
                            (uint32_t) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
2304
2303
                                        HA_GET_INDEX),
2305
 
                            (EXTRA_RECORD),
2306
2304
                            ha_open_options,
2307
2305
                            new_tmp_table))
2308
2306
  {