diff options
| author | unknown <monty@mysql.com> | 2005-11-23 22:58:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-23 22:58:53 +0200 |
| commit | 079d47f8f8a3801089cd8324cee80d886876cdc8 (patch) | |
| tree | 8972ae3c8dffff8f3b6f27565d191af346c9ac8d /sql/ha_innodb.cc | |
| parent | 8d839ebe2cc98618ff1affac39fb382f4bd091c0 (diff) | |
| parent | 9fb36b2d803c05b3242d0ae736d3e298d5523281 (diff) | |
| download | mariadb-git-079d47f8f8a3801089cd8324cee80d886876cdc8.tar.gz | |
Merge mysql.com:/home/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1-TDC
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/key.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/parse_file.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/structs.h:
Auto merged
sql/field.cc:
Merge with global tree
sql/sql_base.cc:
Merge with global tree
sql/table.cc:
Merge with global tree
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index dae018e71f1..1562803aed7 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -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 | @@ -4820,8 +4820,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 |