← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merged captain branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
352
352
        return(ha_innobase_exts);
353
353
  }
354
354
 
355
 
  UNIV_INTERN int createTableImpl(Session *session, const char *table_name, Table *form,
356
 
                      HA_CREATE_INFO *create_info);
357
 
  UNIV_INTERN int renameTableImpl(Session* session, const char* from, const char* to);
358
 
  UNIV_INTERN int deleteTableImpl(Session* session, const string table_path);
 
355
  UNIV_INTERN int createTableImplementation(Session *session, 
 
356
                                            const char *table_name,
 
357
                                            Table *form,
 
358
                                            HA_CREATE_INFO *create_info,
 
359
                                            drizzled::message::Table*);
 
360
  UNIV_INTERN int renameTableImplementation(Session* session,
 
361
                                            const char* from, 
 
362
                                            const char* to);
 
363
  UNIV_INTERN int deleteTableImplementation(Session* session, const string table_path);
359
364
};
360
365
 
361
366
/****************************************************************
5503
5508
Creates a new table to an InnoDB database. */
5504
5509
UNIV_INTERN
5505
5510
int
5506
 
InnobaseEngine::createTableImpl(
 
5511
InnobaseEngine::createTableImplementation(
5507
5512
/*================*/
5508
5513
                                        /* out: error number */
5509
5514
        Session*        session,        /* in: table name */
5510
5515
        const char*     table_name,     /* in: table name */
5511
5516
        Table*          form,           /* in: information on table
5512
5517
                                        columns and indexes */
5513
 
        HA_CREATE_INFO* create_info)    /* in: more information of the
 
5518
        HA_CREATE_INFO* create_info,    /* in: more information of the
5514
5519
                                        created table, contains also the
5515
5520
                                        create statement string */
 
5521
        drizzled::message::Table*)
5516
5522
{
5517
5523
        int             error;
5518
5524
        dict_table_t*   innobase_table;
5935
5941
inside InnoDB. */
5936
5942
UNIV_INTERN
5937
5943
int
5938
 
InnobaseEngine::deleteTableImpl(
 
5944
InnobaseEngine::deleteTableImplementation(
5939
5945
/*======================*/
5940
5946
                                /* out: error number */
5941
5947
        Session *session,
6133
6139
Renames an InnoDB table. */
6134
6140
UNIV_INTERN
6135
6141
int
6136
 
InnobaseEngine::renameTableImpl(
 
6142
InnobaseEngine::renameTableImplementation(
6137
6143
/*======================*/
6138
6144
                                /* out: 0 or error code */
6139
6145
        Session*        session,