mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 15:54:37 +01:00
From MySQL:
We new use TABLE_SHARE instead of TABLE when creating engine handlers.
This commit is contained in:
parent
2c784ee39f
commit
659215dca1
2 changed files with 6 additions and 6 deletions
|
@ -205,7 +205,7 @@ static int innobase_rollback(THD* thd, bool all);
|
|||
static int innobase_rollback_to_savepoint(THD* thd, void *savepoint);
|
||||
static int innobase_savepoint(THD* thd, void *savepoint);
|
||||
static int innobase_release_savepoint(THD* thd, void *savepoint);
|
||||
static handler *innobase_create_handler(TABLE *table);
|
||||
static handler *innobase_create_handler(TABLE_SHARE *table);
|
||||
|
||||
handlerton innobase_hton = {
|
||||
"InnoDB",
|
||||
|
@ -245,7 +245,7 @@ handlerton innobase_hton = {
|
|||
};
|
||||
|
||||
|
||||
static handler *innobase_create_handler(TABLE *table)
|
||||
static handler *innobase_create_handler(TABLE_SHARE *table)
|
||||
{
|
||||
return new ha_innobase(table);
|
||||
}
|
||||
|
@ -826,7 +826,7 @@ check_trx_exists(
|
|||
/*************************************************************************
|
||||
Construct ha_innobase handler. */
|
||||
|
||||
ha_innobase::ha_innobase(TABLE *table_arg)
|
||||
ha_innobase::ha_innobase(TABLE_SHARE *table_arg)
|
||||
:handler(&innobase_hton, table_arg),
|
||||
int_table_flags(HA_REC_NOT_IN_SEQ |
|
||||
HA_NULL_IN_KEY |
|
||||
|
@ -4827,8 +4827,8 @@ ha_innobase::create(
|
|||
|
||||
/* Look for a primary key */
|
||||
|
||||
primary_key_no= (table->s->primary_key != MAX_KEY ?
|
||||
(int) table->s->primary_key :
|
||||
primary_key_no= (form->s->primary_key != MAX_KEY ?
|
||||
(int) form->s->primary_key :
|
||||
-1);
|
||||
|
||||
/* Our function row_get_mysql_key_number_for_index assumes
|
||||
|
|
|
@ -81,7 +81,7 @@ class ha_innobase: public handler
|
|||
|
||||
/* Init values for the class: */
|
||||
public:
|
||||
ha_innobase(TABLE *table_arg);
|
||||
ha_innobase(TABLE_SHARE *table_arg);
|
||||
~ha_innobase() {}
|
||||
/*
|
||||
Get the row type from the storage engine. If this method returns
|
||||
|
|
Loading…
Add table
Reference in a new issue