← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Stewart Smith
  • Date: 2010-01-09 01:51:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1266.
  • Revision ID: stewart@flamingspork.com-20100109015111-yvwtu0dgsrgcc7wk
remove the effectively dead READ_ALL and EXTRA_RECORD defines that were part of the rotting FRM corspe. This means we can remove prgflag from open_table_from_share()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1308
1308
    db_stat             open flags (for example HA_OPEN_KEYFILE|
1309
1309
                        HA_OPEN_RNDFILE..) can be 0 (example in
1310
1310
                        ha_example_table)
1311
 
    prgflag             READ_ALL etc..
1312
1311
    ha_open_flags       HA_OPEN_ABORT_IF_LOCKED etc..
1313
1312
    outparam            result table
1314
1313
 
1323
1322
*/
1324
1323
 
1325
1324
int open_table_from_share(Session *session, TableShare *share, const char *alias,
1326
 
                          uint32_t db_stat, uint32_t prgflag, uint32_t ha_open_flags,
 
1325
                          uint32_t db_stat, uint32_t ha_open_flags,
1327
1326
                          Table *outparam)
1328
1327
{
1329
1328
  int error;
1350
1349
  records= 0;
1351
1350
  if ((db_stat & HA_OPEN_KEYFILE))
1352
1351
    records=1;
1353
 
  assert (prgflag & (READ_ALL+EXTRA_RECORD));
 
1352
 
1354
1353
  records++;
1355
1354
 
1356
1355
  if (!(record= (unsigned char*) alloc_root(&outparam->mem_root,