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
c13e3c37
Commit
c13e3c37
authored
May 22, 2018
by
Eugene Kosov
Committed by
Sergey Vojtovich
May 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup TABLE_LIST
parent
611488e3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
11 deletions
+5
-11
sql/sql_insert.cc
sql/sql_insert.cc
+0
-6
sql/table.cc
sql/table.cc
+4
-1
sql/table.h
sql/table.h
+1
-4
No files found.
sql/sql_insert.cc
View file @
c13e3c37
...
...
@@ -749,12 +749,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
table_list
->
table_name
.
str
);
DBUG_RETURN
(
TRUE
);
}
/*
mark the table_list as a target for insert, to skip the DT/view prepare phase
for correct access rights checks
TODO: remove this hack
*/
table_list
->
skip_prepare_derived
=
TRUE
;
if
(
table_list
->
lock_type
==
TL_WRITE_DELAYED
)
{
...
...
sql/table.cc
View file @
c13e3c37
...
...
@@ -8275,7 +8275,10 @@ bool TABLE_LIST::change_refs_to_fields()
if
(
!
used_items
.
elements
)
return
FALSE
;
materialized_items
=
(
Item
**
)
thd
->
calloc
(
sizeof
(
void
*
)
*
table
->
s
->
fields
);
Item
**
materialized_items
=
(
Item
**
)
thd
->
calloc
(
sizeof
(
void
*
)
*
table
->
s
->
fields
);
if
(
!
materialized_items
)
return
TRUE
;
while
((
ref
=
(
Item_direct_ref
*
)
li
++
))
{
...
...
sql/table.h
View file @
c13e3c37
...
...
@@ -2268,7 +2268,7 @@ struct TABLE_LIST
/* TABLE_TYPE_UNKNOWN if any type is acceptable */
Table_type
required_type
;
handlerton
*
db_type
;
/* table_type for handler */
char
timestamp_buffer
[
20
];
/* buffer for timestamp (19+1) */
char
timestamp_buffer
[
MAX_DATETIME_WIDTH
+
1
];
/*
This TABLE_LIST object is just placeholder for prelocking, it will be
used for implicit LOCK TABLES only and won't be used in real statement.
...
...
@@ -2300,8 +2300,6 @@ struct TABLE_LIST
/* TODO: replace with derived_type */
bool
merged
;
bool
merged_for_insert
;
/* TRUE <=> don't prepare this derived table/view as it should be merged.*/
bool
skip_prepare_derived
;
bool
sequence
;
/* Part of NEXTVAL/CURVAL/LASTVAL */
/*
...
...
@@ -2311,7 +2309,6 @@ struct TABLE_LIST
List
<
Item
>
used_items
;
/* Sublist (tail) of persistent used_items */
List
<
Item
>
persistent_used_items
;
Item
**
materialized_items
;
/* View creation context. */
...
...
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