← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2009-11-14 23:51:37 UTC
  • mfrom: (1217.1.2 staging)
  • Revision ID: brian@gaz-20091114235137-k8yrpjlmo9qj36w6
Remove open mode/dead bits around dead temp type.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1270
1270
    prgflag             READ_ALL etc..
1271
1271
    ha_open_flags       HA_OPEN_ABORT_IF_LOCKED etc..
1272
1272
    outparam            result table
1273
 
    open_mode           One of OTM_OPEN|OTM_CREATE|OTM_ALTER
1274
 
                        if OTM_CREATE some errors are ignore
1275
 
                        if OTM_ALTER HA_OPEN is not called
1276
1273
 
1277
1274
  RETURN VALUES
1278
1275
   0    ok
1286
1283
 
1287
1284
int open_table_from_share(Session *session, TableShare *share, const char *alias,
1288
1285
                          uint32_t db_stat, uint32_t prgflag, uint32_t ha_open_flags,
1289
 
                          Table *outparam, open_table_mode open_mode)
 
1286
                          Table *outparam)
1290
1287
{
1291
1288
  int error;
1292
1289
  uint32_t records, i, bitmap_size;
1439
1436
 
1440
1437
  /* The table struct is now initialized;  Open the table */
1441
1438
  error= 2;
1442
 
  if (db_stat && open_mode != OTM_ALTER)
 
1439
  if (db_stat)
1443
1440
  {
1444
1441
    int ha_err;
1445
1442
    if ((ha_err= (outparam->cursor->