← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

  • Committer: Brian Aker
  • Date: 2010-06-21 00:20:07 UTC
  • mto: (1633.4.1 rollup)
  • mto: This revision was merged to the branch mainline in revision 1635.
  • Revision ID: brian@gir-2.local-20100621002007-rnuo9shkr02gra3h
Adding in TableIdentifier for ha_open; (first pass)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
84
84
  if (!(new_handler->ref= (unsigned char*) mem_root->alloc_root(ALIGN_SIZE(ref_length)*2)))
85
85
    return NULL;
86
86
 
87
 
  if (new_handler && !new_handler->ha_open(table,
 
87
  TableIdentifier identifier(table->getShare()->getSchemaName(),
 
88
                             table->getShare()->getTableName(),
 
89
                             table->getShare()->getType());
 
90
 
 
91
  if (new_handler && !new_handler->ha_open(identifier,
 
92
                                           table,
88
93
                                           table->getMutableShare()->getNormalizedPath(),
89
94
                                           table->getDBStat(),
90
95
                                           HA_OPEN_IGNORE_IF_LOCKED))
213
218
  Try O_RDONLY if cannot open as O_RDWR
214
219
  Don't wait for locks if not HA_OPEN_WAIT_IF_LOCKED is set
215
220
*/
216
 
int Cursor::ha_open(Table *table_arg, const char *name, int mode,
217
 
                     int test_if_locked)
 
221
int Cursor::ha_open(const TableIdentifier &,
 
222
                    Table *table_arg, const char *name, int mode,
 
223
                    int test_if_locked)
218
224
{
219
225
  int error;
220
226