Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7fca91f2
Commit
7fca91f2
authored
Nov 26, 2016
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: InnoDB, dict_create_add_foreign_to_dictionary()
remove 'table' argument, remnant of 5.6, does not exist in 5.7
parent
528dd5f2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
storage/innobase/dict/dict0crea.cc
storage/innobase/dict/dict0crea.cc
+3
-6
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+1
-1
storage/innobase/include/dict0crea.h
storage/innobase/include/dict0crea.h
+0
-1
No files found.
storage/innobase/dict/dict0crea.cc
View file @
7fca91f2
...
...
@@ -2189,7 +2189,6 @@ Add a foreign key definition to the data dictionary tables.
dberr_t
dict_create_add_foreign_to_dictionary
(
/*==================================*/
dict_table_t
*
table
,
/*!< in: table */
const
char
*
name
,
/*!< in: table name */
const
dict_foreign_t
*
foreign
,
/*!< in: foreign key */
trx_t
*
trx
)
/*!< in/out: dictionary transaction */
...
...
@@ -2231,8 +2230,7 @@ dict_create_add_foreign_to_dictionary(
char
*
fk_def
;
innobase_convert_name
(
tablename
,
MAX_TABLE_NAME_LEN
,
table
->
name
.
m_name
,
strlen
(
table
->
name
.
m_name
),
trx
->
mysql_thd
);
name
,
strlen
(
name
),
trx
->
mysql_thd
);
innobase_convert_name
(
buf
,
MAX_TABLE_NAME_LEN
,
foreign
->
id
,
strlen
(
foreign
->
id
),
trx
->
mysql_thd
);
...
...
@@ -2263,8 +2261,7 @@ dict_create_add_foreign_to_dictionary(
char
*
fk_def
;
innobase_convert_name
(
tablename
,
MAX_TABLE_NAME_LEN
,
table
->
name
.
m_name
,
strlen
(
table
->
name
.
m_name
),
trx
->
mysql_thd
);
name
,
strlen
(
name
),
trx
->
mysql_thd
);
innobase_convert_name
(
buf
,
MAX_TABLE_NAME_LEN
,
foreign
->
id
,
strlen
(
foreign
->
id
),
trx
->
mysql_thd
);
fk_def
=
dict_foreign_def_get
((
dict_foreign_t
*
)
foreign
,
trx
);
...
...
@@ -2513,7 +2510,7 @@ dict_create_add_foreigns_to_dictionary(
ut_ad
(
foreign
->
id
!=
NULL
);
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
)
{
...
...
storage/innobase/handler/handler0alter.cc
View file @
7fca91f2
...
...
@@ -7697,7 +7697,7 @@ innobase_update_foreign_try(
names, while the columns in ctx->old_table have not
been renamed yet. */
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
(
"innodb_test_cannot_add_fk_system"
,
...
...
storage/innobase/include/dict0crea.h
View file @
7fca91f2
...
...
@@ -276,7 +276,6 @@ Add a foreign key definition to the data dictionary tables.
dberr_t
dict_create_add_foreign_to_dictionary
(
/*==================================*/
dict_table_t
*
table
,
/*!< in: table */
const
char
*
name
,
/*!< in: table name */
const
dict_foreign_t
*
foreign
,
/*!< in: foreign key */
trx_t
*
trx
)
/*!< in/out: dictionary transaction */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment