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
84cbd69c
Commit
84cbd69c
authored
Feb 13, 2019
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: reformat
parent
c0745e37
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
25 deletions
+13
-25
sql/sql_insert.cc
sql/sql_insert.cc
+2
-4
sql/sql_table.cc
sql/sql_table.cc
+11
-21
No files found.
sql/sql_insert.cc
View file @
84cbd69c
...
@@ -4147,10 +4147,8 @@ Field *Item::create_field_for_create_select(TABLE *table)
...
@@ -4147,10 +4147,8 @@ Field *Item::create_field_for_create_select(TABLE *table)
@retval 0 Error
@retval 0 Error
*/
*/
TABLE
*
select_create
::
create_table_from_items
(
THD
*
thd
,
TABLE
*
select_create
::
create_table_from_items
(
THD
*
thd
,
List
<
Item
>
*
items
,
List
<
Item
>
*
items
,
MYSQL_LOCK
**
lock
,
TABLEOP_HOOKS
*
hooks
)
MYSQL_LOCK
**
lock
,
TABLEOP_HOOKS
*
hooks
)
{
{
TABLE
tmp_table
;
// Used during 'Create_field()'
TABLE
tmp_table
;
// Used during 'Create_field()'
TABLE_SHARE
share
;
TABLE_SHARE
share
;
...
...
sql/sql_table.cc
View file @
84cbd69c
...
@@ -4438,12 +4438,11 @@ static bool vers_prepare_keys(THD *thd, HA_CREATE_INFO *create_info,
...
@@ -4438,12 +4438,11 @@ static bool vers_prepare_keys(THD *thd, HA_CREATE_INFO *create_info,
return
false
;
return
false
;
}
}
handler
*
mysql_create_frm_image
(
THD
*
thd
,
handler
*
mysql_create_frm_image
(
THD
*
thd
,
const
LEX_CSTRING
*
db
,
const
LEX_CSTRING
*
db
,
const
LEX_CSTRING
*
table_name
,
const
LEX_CSTRING
*
table_name
,
HA_CREATE_INFO
*
create_info
,
HA_CREATE_INFO
*
create_info
,
Alter_info
*
alter_info
,
int
create_table_mode
,
Alter_info
*
alter_info
,
int
create_table_mode
,
KEY
**
key_info
,
KEY
**
key_info
,
uint
*
key_count
,
uint
*
key_count
,
LEX_CUSTRING
*
frm
)
LEX_CUSTRING
*
frm
)
{
{
uint
db_options
;
uint
db_options
;
...
@@ -4681,8 +4680,7 @@ handler *mysql_create_frm_image(THD *thd,
...
@@ -4681,8 +4680,7 @@ handler *mysql_create_frm_image(THD *thd,
}
}
if
(
mysql_prepare_create_table
(
thd
,
create_info
,
alter_info
,
&
db_options
,
if
(
mysql_prepare_create_table
(
thd
,
create_info
,
alter_info
,
&
db_options
,
file
,
key_info
,
key_count
,
file
,
key_info
,
key_count
,
create_table_mode
))
create_table_mode
))
goto
err
;
goto
err
;
create_info
->
table_options
=
db_options
;
create_info
->
table_options
=
db_options
;
...
@@ -4734,19 +4732,13 @@ handler *mysql_create_frm_image(THD *thd,
...
@@ -4734,19 +4732,13 @@ handler *mysql_create_frm_image(THD *thd,
*/
*/
static
static
int
create_table_impl
(
THD
*
thd
,
int
create_table_impl
(
THD
*
thd
,
const
LEX_CSTRING
*
orig_db
,
const
LEX_CSTRING
*
orig_db
,
const
LEX_CSTRING
*
orig_table_name
,
const
LEX_CSTRING
*
orig_table_name
,
const
LEX_CSTRING
*
db
,
const
LEX_CSTRING
*
table_name
,
const
LEX_CSTRING
*
db
,
const
LEX_CSTRING
*
table_name
,
const
char
*
path
,
const
char
*
path
,
const
DDL_options_st
options
,
const
DDL_options_st
options
,
HA_CREATE_INFO
*
create_info
,
Alter_info
*
alter_info
,
HA_CREATE_INFO
*
create_info
,
int
create_table_mode
,
bool
*
is_trans
,
KEY
**
key_info
,
Alter_info
*
alter_info
,
uint
*
key_count
,
LEX_CUSTRING
*
frm
)
int
create_table_mode
,
bool
*
is_trans
,
KEY
**
key_info
,
uint
*
key_count
,
LEX_CUSTRING
*
frm
)
{
{
LEX_CSTRING
*
alias
;
LEX_CSTRING
*
alias
;
handler
*
file
=
0
;
handler
*
file
=
0
;
...
@@ -5026,13 +5018,11 @@ int create_table_impl(THD *thd,
...
@@ -5026,13 +5018,11 @@ int create_table_impl(THD *thd,
-1 Table was used with IF NOT EXISTS and table existed (warning, not error)
-1 Table was used with IF NOT EXISTS and table existed (warning, not error)
*/
*/
int
mysql_create_table_no_lock
(
THD
*
thd
,
int
mysql_create_table_no_lock
(
THD
*
thd
,
const
LEX_CSTRING
*
db
,
const
LEX_CSTRING
*
db
,
const
LEX_CSTRING
*
table_name
,
const
LEX_CSTRING
*
table_name
,
Table_specification_st
*
create_info
,
Table_specification_st
*
create_info
,
Alter_info
*
alter_info
,
bool
*
is_trans
,
Alter_info
*
alter_info
,
bool
*
is_trans
,
int
create_table_mode
,
int
create_table_mode
,
TABLE_LIST
*
table_list
)
TABLE_LIST
*
table_list
)
{
{
KEY
*
not_used_1
;
KEY
*
not_used_1
;
uint
not_used_2
;
uint
not_used_2
;
...
...
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