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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
488269e2
Commit
488269e2
authored
Nov 27, 2009
by
Tor Didriksen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#49165 Remove unused/confusing code/comments in setup_conds()
parent
76223362
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
12 deletions
+0
-12
sql/sql_base.cc
sql/sql_base.cc
+0
-6
sql/sql_lex.cc
sql/sql_lex.cc
+0
-1
sql/sql_lex.h
sql/sql_lex.h
+0
-5
No files found.
sql/sql_base.cc
View file @
488269e2
...
...
@@ -8008,7 +8008,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
COND
**
conds
)
{
SELECT_LEX
*
select_lex
=
thd
->
lex
->
current_select
;
Query_arena
*
arena
=
thd
->
stmt_arena
,
backup
;
TABLE_LIST
*
table
=
NULL
;
// For HP compilers
/*
it_is_update set to TRUE when tables of primary SELECT_LEX (SELECT_LEX
...
...
@@ -8024,10 +8023,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
select_lex
->
is_item_list_lookup
=
0
;
DBUG_ENTER
(
"setup_conds"
);
if
(
select_lex
->
conds_processed_with_permanent_arena
||
arena
->
is_conventional
())
arena
=
0
;
// For easier test
thd
->
mark_used_columns
=
MARK_COLUMNS_READ
;
DBUG_PRINT
(
"info"
,
(
"thd->mark_used_columns: %d"
,
thd
->
mark_used_columns
));
select_lex
->
cond_count
=
0
;
...
...
@@ -8096,7 +8091,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
We do this ON -> WHERE transformation only once per PS/SP statement.
*/
select_lex
->
where
=
*
conds
;
select_lex
->
conds_processed_with_permanent_arena
=
1
;
}
thd
->
lex
->
current_select
->
is_item_list_lookup
=
save_is_item_list_lookup
;
DBUG_RETURN
(
test
(
thd
->
is_error
()));
...
...
sql/sql_lex.cc
View file @
488269e2
...
...
@@ -1672,7 +1672,6 @@ void st_select_lex::init_query()
parent_lex
->
push_context
(
&
context
);
cond_count
=
between_count
=
with_wild
=
0
;
max_equal_elems
=
0
;
conds_processed_with_permanent_arena
=
0
;
ref_pointer_array
=
0
;
select_n_where_fields
=
0
;
select_n_having_items
=
0
;
...
...
sql/sql_lex.h
View file @
488269e2
...
...
@@ -659,11 +659,6 @@ public:
uint
select_n_where_fields
;
enum_parsing_place
parsing_place
;
/* where we are parsing expression */
bool
with_sum_func
;
/* sum function indicator */
/*
PS or SP cond natural joins was alredy processed with permanent
arena and all additional items which we need alredy stored in it
*/
bool
conds_processed_with_permanent_arena
;
ulong
table_join_options
;
uint
in_sum_expr
;
...
...
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