Commit 94cdd5c0 authored by osku's avatar osku

From MySQL:

We new use TABLE_SHARE instead of TABLE when creating engine handlers.
parent 1ed017dd
...@@ -205,7 +205,7 @@ static int innobase_rollback(THD* thd, bool all); ...@@ -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_rollback_to_savepoint(THD* thd, void *savepoint);
static int innobase_savepoint(THD* thd, void *savepoint); static int innobase_savepoint(THD* thd, void *savepoint);
static int innobase_release_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 = { handlerton innobase_hton = {
"InnoDB", "InnoDB",
...@@ -245,7 +245,7 @@ handlerton innobase_hton = { ...@@ -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); return new ha_innobase(table);
} }
...@@ -826,7 +826,7 @@ check_trx_exists( ...@@ -826,7 +826,7 @@ check_trx_exists(
/************************************************************************* /*************************************************************************
Construct ha_innobase handler. */ Construct ha_innobase handler. */
ha_innobase::ha_innobase(TABLE *table_arg) ha_innobase::ha_innobase(TABLE_SHARE *table_arg)
:handler(&innobase_hton, table_arg), :handler(&innobase_hton, table_arg),
int_table_flags(HA_REC_NOT_IN_SEQ | int_table_flags(HA_REC_NOT_IN_SEQ |
HA_NULL_IN_KEY | HA_NULL_IN_KEY |
...@@ -4827,8 +4827,8 @@ ha_innobase::create( ...@@ -4827,8 +4827,8 @@ ha_innobase::create(
/* Look for a primary key */ /* Look for a primary key */
primary_key_no= (table->s->primary_key != MAX_KEY ? primary_key_no= (form->s->primary_key != MAX_KEY ?
(int) table->s->primary_key : (int) form->s->primary_key :
-1); -1);
/* Our function row_get_mysql_key_number_for_index assumes /* Our function row_get_mysql_key_number_for_index assumes
......
...@@ -81,7 +81,7 @@ class ha_innobase: public handler ...@@ -81,7 +81,7 @@ class ha_innobase: public handler
/* Init values for the class: */ /* Init values for the class: */
public: public:
ha_innobase(TABLE *table_arg); ha_innobase(TABLE_SHARE *table_arg);
~ha_innobase() {} ~ha_innobase() {}
/* /*
Get the row type from the storage engine. If this method returns Get the row type from the storage engine. If this method returns
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment