← 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: 2008-08-20 03:21:20 UTC
  • Revision ID: brian@tangent.org-20080820032120-lv3c5pu3owhex19j
flag cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
3105
3105
                                               HA_OPEN_RNDFILE |
3106
3106
                                               HA_GET_INDEX |
3107
3107
                                               HA_TRY_READ_ONLY),
3108
 
                                       (READ_KEYINFO | COMPUTE_TYPES |
3109
 
                                        EXTRA_RECORD),
 
3108
                                       (READ_KEYINFO | EXTRA_RECORD),
3110
3109
                                       thd->open_options, entry, OTM_OPEN)))
3111
3110
  {
3112
3111
    if (error == 7)                             // Table def changed
3168
3167
                               (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
3169
3168
                                       HA_GET_INDEX |
3170
3169
                                       HA_TRY_READ_ONLY),
3171
 
                               READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD,
 
3170
                               READ_KEYINFO | EXTRA_RECORD,
3172
3171
                               ha_open_options | HA_OPEN_FOR_REPAIR,
3173
3172
                               entry, OTM_OPEN) || ! entry->file ||
3174
3173
        (entry->file->is_crashed() && entry->file->ha_check_and_repair(thd)))
3894
3893
                            (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
3895
3894
                                    HA_GET_INDEX),
3896
3895
                            (open_mode == OTM_ALTER) ?
3897
 
                              (READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD |
3898
 
                               OPEN_FRM_FILE_ONLY)
3899
 
                            : (READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD),
 
3896
                              (READ_KEYINFO | EXTRA_RECORD | OPEN_FRM_FILE_ONLY)
 
3897
                            : (READ_KEYINFO | EXTRA_RECORD),
3900
3898
                            ha_open_options,
3901
3899
                            tmp_table, open_mode))
3902
3900
  {