Commit 7fca91f2 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: InnoDB, dict_create_add_foreign_to_dictionary()

remove 'table' argument, remnant of 5.6, does not exist in 5.7
parent 528dd5f2
...@@ -2189,7 +2189,6 @@ Add a foreign key definition to the data dictionary tables. ...@@ -2189,7 +2189,6 @@ Add a foreign key definition to the data dictionary tables.
dberr_t dberr_t
dict_create_add_foreign_to_dictionary( dict_create_add_foreign_to_dictionary(
/*==================================*/ /*==================================*/
dict_table_t* table, /*!< in: table */
const char* name, /*!< in: table name */ const char* name, /*!< in: table name */
const dict_foreign_t* foreign,/*!< in: foreign key */ const dict_foreign_t* foreign,/*!< in: foreign key */
trx_t* trx) /*!< in/out: dictionary transaction */ trx_t* trx) /*!< in/out: dictionary transaction */
...@@ -2231,8 +2230,7 @@ dict_create_add_foreign_to_dictionary( ...@@ -2231,8 +2230,7 @@ dict_create_add_foreign_to_dictionary(
char* fk_def; char* fk_def;
innobase_convert_name(tablename, MAX_TABLE_NAME_LEN, innobase_convert_name(tablename, MAX_TABLE_NAME_LEN,
table->name.m_name, strlen(table->name.m_name), name, strlen(name), trx->mysql_thd);
trx->mysql_thd);
innobase_convert_name(buf, MAX_TABLE_NAME_LEN, innobase_convert_name(buf, MAX_TABLE_NAME_LEN,
foreign->id, strlen(foreign->id), trx->mysql_thd); foreign->id, strlen(foreign->id), trx->mysql_thd);
...@@ -2263,8 +2261,7 @@ dict_create_add_foreign_to_dictionary( ...@@ -2263,8 +2261,7 @@ dict_create_add_foreign_to_dictionary(
char* fk_def; char* fk_def;
innobase_convert_name(tablename, MAX_TABLE_NAME_LEN, innobase_convert_name(tablename, MAX_TABLE_NAME_LEN,
table->name.m_name, strlen(table->name.m_name), name, strlen(name), trx->mysql_thd);
trx->mysql_thd);
innobase_convert_name(buf, MAX_TABLE_NAME_LEN, innobase_convert_name(buf, MAX_TABLE_NAME_LEN,
foreign->id, strlen(foreign->id), trx->mysql_thd); foreign->id, strlen(foreign->id), trx->mysql_thd);
fk_def = dict_foreign_def_get((dict_foreign_t*)foreign, trx); fk_def = dict_foreign_def_get((dict_foreign_t*)foreign, trx);
...@@ -2513,7 +2510,7 @@ dict_create_add_foreigns_to_dictionary( ...@@ -2513,7 +2510,7 @@ dict_create_add_foreigns_to_dictionary(
ut_ad(foreign->id != NULL); ut_ad(foreign->id != NULL);
error = dict_create_add_foreign_to_dictionary( error = dict_create_add_foreign_to_dictionary(
(dict_table_t*)table, table->name.m_name, foreign, trx); table->name.m_name, foreign, trx);
if (error != DB_SUCCESS) { if (error != DB_SUCCESS) {
......
...@@ -7697,7 +7697,7 @@ innobase_update_foreign_try( ...@@ -7697,7 +7697,7 @@ innobase_update_foreign_try(
names, while the columns in ctx->old_table have not names, while the columns in ctx->old_table have not
been renamed yet. */ been renamed yet. */
error = dict_create_add_foreign_to_dictionary( error = dict_create_add_foreign_to_dictionary(
(dict_table_t*)ctx->old_table,ctx->old_table->name.m_name, fk, trx); ctx->old_table->name.m_name, fk, trx);
DBUG_EXECUTE_IF( DBUG_EXECUTE_IF(
"innodb_test_cannot_add_fk_system", "innodb_test_cannot_add_fk_system",
......
...@@ -276,7 +276,6 @@ Add a foreign key definition to the data dictionary tables. ...@@ -276,7 +276,6 @@ Add a foreign key definition to the data dictionary tables.
dberr_t dberr_t
dict_create_add_foreign_to_dictionary( dict_create_add_foreign_to_dictionary(
/*==================================*/ /*==================================*/
dict_table_t* table, /*!< in: table */
const char* name, /*!< in: table name */ const char* name, /*!< in: table name */
const dict_foreign_t* foreign,/*!< in: foreign key */ const dict_foreign_t* foreign,/*!< in: foreign key */
trx_t* trx) /*!< in/out: dictionary transaction */ trx_t* trx) /*!< in/out: dictionary transaction */
......
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