diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-12-09 21:55:14 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-12-09 21:55:14 -0800 |
| commit | c4080280dfb45e31d3e6936fe08f571d66a62ed9 (patch) | |
| tree | edd6c95f94663af654b856acb327213b3e408958 /sql/mysqld.cc | |
| parent | f960f2334dab6bef702a6f36e90dcdf6835588b6 (diff) | |
| parent | 3e946fa7ad833751e90d2263ca896d419c6a499d (diff) | |
| download | mariadb-git-c4080280dfb45e31d3e6936fe08f571d66a62ed9.tar.gz | |
Merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c3d58349ad5..9d662ea0174 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -338,7 +338,7 @@ TYPELIB sql_mode_typelib= { array_elements(sql_mode_names)-1,"", static const char *optimizer_switch_names[]= { "index_merge","index_merge_union","index_merge_sort_union", - "index_merge_intersection", + "index_merge_intersection","index_merge_sort_intersection", #ifndef DBUG_OFF "table_elimination", #endif @@ -352,6 +352,7 @@ static const unsigned int optimizer_switch_names_len[]= sizeof("index_merge_union") - 1, sizeof("index_merge_sort_union") - 1, sizeof("index_merge_intersection") - 1, + sizeof("index_merge_sort_intersection") - 1, #ifndef DBUG_OFF sizeof("table_elimination") - 1, #endif @@ -431,7 +432,8 @@ static const char *sql_mode_str= "OFF"; /* Text representation for OPTIMIZER_SWITCH_DEFAULT */ static const char *optimizer_switch_str="index_merge=on,index_merge_union=on," "index_merge_sort_union=on," - "index_merge_intersection=on" + "index_merge_intersection=on," + "index_merge_sort_intersection=on" #ifndef DBUG_OFF ",table_elimination=on"; #else @@ -7297,7 +7299,8 @@ thread is in the relay logs.", 0, GET_ULONG, OPT_ARG, MAX_TABLES+1, 0, MAX_TABLES+2, 0, 1, 0}, {"optimizer_switch", OPT_OPTIMIZER_SWITCH, "optimizer_switch=option=val[,option=val...], where option={index_merge, " - "index_merge_union, index_merge_sort_union, index_merge_intersection" + "index_merge_union, index_merge_sort_union, index_merge_intersection, " + "index_merge_sort_intersection" #ifndef DBUG_OFF ", table_elimination" #endif |