← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.h

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.h
440
440
    memset(null_flags, 255, s->null_bytes);
441
441
  }
442
442
 
443
 
  bool rename_temporary_table(const char *db, const char *table_name);
 
443
  bool renameAlterTemporaryTable(TableIdentifier &identifier);
444
444
  void free_io_cache();
445
445
  void filesort_free_buffers(bool full= false);
446
446
  void intern_close_table();
554
554
 
555
555
TableShare *alloc_table_share(TableList *table_list, char *key,
556
556
                               uint32_t key_length);
557
 
int open_table_def(Session& session, TableShare *share);
 
557
int open_table_def(Session& session, TableIdentifier &identifier, TableShare *share);
558
558
void open_table_error(TableShare *share, int error, int db_errno, int errarg);
559
559
int open_table_from_share(Session *session, TableShare *share, const char *alias,
560
560
                          uint32_t db_stat, uint32_t ha_open_flags,