← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Brian Aker
  • Date: 2011-02-12 10:06:03 UTC
  • mfrom: (2154.2.16 drizzle-build)
  • Revision ID: brian@tangent.org-20110212100603-i5ww0s02p8l4a8q7
Merge in solaris tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
466
466
  UNIV_INTERN int doRenameTable(Session&, const identifier::Table &from, const identifier::Table &to);
467
467
  UNIV_INTERN int doDropTable(Session &session, const identifier::Table &identifier);
468
468
 
469
 
  UNIV_INTERN virtual bool get_error_message(int error, String *buf);
 
469
  UNIV_INTERN virtual bool get_error_message(int error, String *buf) const;
470
470
 
471
471
  UNIV_INTERN uint32_t max_supported_keys() const;
472
472
  UNIV_INTERN uint32_t max_supported_key_length() const;
7759
7759
                              tmp_foreign_fields, tmp_referenced_fields);
7760
7760
 
7761
7761
    ForeignKeyInfo *pf_key_info = (ForeignKeyInfo *)
7762
 
      session->memdup(&f_key_info, sizeof(ForeignKeyInfo));
 
7762
      session->getMemRoot()->duplicate(&f_key_info, sizeof(ForeignKeyInfo));
7763
7763
    f_key_list->push_back(pf_key_info);
7764
7764
    foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
7765
7765
  }
8703
8703
/* See comment in Cursor.cc */
8704
8704
UNIV_INTERN
8705
8705
bool
8706
 
InnobaseEngine::get_error_message(int, String *buf)
 
8706
InnobaseEngine::get_error_message(int, String *buf) const
8707
8707
{
8708
8708
  trx_t*  trx = check_trx_exists(current_session);
8709
8709