← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/memory/ha_heap.cc

  • Committer: Monty Taylor
  • Date: 2011-03-10 18:13:13 UTC
  • mfrom: (2224.4.4 drizzle-trunk)
  • mto: This revision was merged to the branch mainline in revision 2228.
  • Revision ID: mordred@inaugust.com-20110310181313-fwpgleax1dd3ehns
Merged Brian: Fixes for 731189

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memory/ha_heap.cc
72
72
  int doCreateTable(Session &session,
73
73
                    Table &table_arg,
74
74
                    const identifier::Table &identifier,
75
 
                    message::Table &create_proto);
 
75
                    const message::Table &create_proto);
76
76
 
77
77
  /* For whatever reason, internal tables can be created by Cursor::open()
78
78
     for MEMORY.
82
82
  int heap_create_table(Session *session, const char *table_name,
83
83
                        Table *table_arg,
84
84
                        bool internal_table,
85
 
                        message::Table &create_proto,
 
85
                        const message::Table &create_proto,
86
86
                        HP_SHARE **internal_share);
87
87
 
88
88
  int doRenameTable(Session&, const identifier::Table &from, const identifier::Table &to);
654
654
int HeapEngine::doCreateTable(Session &session,
655
655
                              Table &table_arg,
656
656
                              const identifier::Table &identifier,
657
 
                              message::Table& create_proto)
 
657
                              const message::Table& create_proto)
658
658
{
659
659
  int error;
660
660
  HP_SHARE *internal_share;
677
677
int HeapEngine::heap_create_table(Session *session, const char *table_name,
678
678
                                  Table *table_arg,
679
679
                                  bool internal_table, 
680
 
                                  message::Table &create_proto,
 
680
                                  const message::Table &create_proto,
681
681
                                  HP_SHARE **internal_share)
682
682
{
683
683
  uint32_t key, parts, mem_per_row_keys= 0;