mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 08:34:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Automatic merge

Browse source
This commit is contained in:
Sergey Petrunya 2013-08-22 14:13:46 +04:00
commit f5ea23b6e2
3 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sql/opt_table_elimination.cc
View file

@ -892,8 +892,11 @@ bool Dep_analysis_context::run_wave(List<Dep_module> *new_bound_modules)
iter= module->init_unbound_values_iter(iter_buf);
while ((value= module->get_next_unbound_value(this, iter)))
{
value->make_bound();
new_bound_values.push_back(value);
if (!value->is_bound())
{
value->make_bound();
new_bound_values.push_back(value);
}
}
}
new_bound_modules->empty();
@ -1740,7 +1743,7 @@ Dep_module* Dep_value_field::get_next_unbound_module(Dep_analysis_context *dac,
- have this field as a part of them
*/
while (key_dep && (key_dep->is_applicable() ||
!field->part_of_key.is_set(key_dep->keyno)))
!field->part_of_key_not_clustered.is_set(key_dep->keyno)))
{
key_dep= key_dep->next_table_key;
}