database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Post-merge fixes.

Browse Source 
Not finished, will not be pushed until additional fixes have been made.
This commit is contained in:
pem@mysql.comhem.se
2004-06-03 19:36:36 +02:00
parent 71eddc362e
commit 3dcd7e53af
4 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/opt_range.cc
View File

@ -662,6 +662,7 @@ QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr,
int QUICK_RANGE_SELECT::init()
{
key_part_info= head->key_info[index].key_part;
return (error= file->index_init(index));
}
@ -2154,7 +2155,7 @@ tree_or(PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2)
{
/* one tree is index merge tree and another is range tree */
if (tree1->merges.is_empty())
swap(SEL_TREE*, tree1, tree2);
swap_variables(SEL_TREE*, tree1, tree2);
/* add tree2 to tree1->merges, checking if it collapses to ALWAYS */
if (imerge_list_or_tree(param, &tree1->merges, tree2))