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
33181e8a
Commit
33181e8a
authored
13 years ago
by
Igor Babaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed LP bug#695304.
The bug was the result of a bad merge maria-5.2-wl21 -> 5.3.
parent
399fa96e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
mysql-test/r/optimizer_switch.result
mysql-test/r/optimizer_switch.result
+3
-0
mysql-test/t/optimizer_switch.test
mysql-test/t/optimizer_switch.test
+4
-1
sql/mysqld.cc
sql/mysqld.cc
+1
-1
No files found.
mysql-test/r/optimizer_switch.result
View file @
33181e8a
...
...
@@ -97,3 +97,6 @@ select @@optimizer_switch;
@@optimizer_switch
index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,firstmatch=on,loosescan=off,materialization=off,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on
set optimizer_switch=default;
select @@optimizer_switch;
@@optimizer_switch
index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,table_elimination=on
This diff is collapsed.
Click to expand it.
mysql-test/t/optimizer_switch.test
View file @
33181e8a
...
...
@@ -110,4 +110,7 @@ set optimizer_switch='default,materialization=off,loosescan=off';
select
@@
optimizer_switch
;
set
optimizer_switch
=
default
;
#
# Bug #695304: invalid default setting for optimizer_switch
#
select
@@
optimizer_switch
;
This diff is collapsed.
Click to expand it.
sql/mysqld.cc
View file @
33181e8a
...
...
@@ -470,7 +470,7 @@ static const char *sql_mode_str= "OFF";
static
const
char
*
optimizer_switch_str
=
"index_merge=on,index_merge_union=on,"
"index_merge_sort_union=on,"
"index_merge_intersection=on,"
"index_merge_sort_intersection=off"
"index_merge_sort_intersection=off
,
"
"index_condition_pushdown=on,"
"firstmatch=on,"
"loosescan=on,"
...
...
This diff is collapsed.
Click to expand it.
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