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 for index_merge/Unique/5.0

Browse Source
This commit is contained in:
sergefp@mysql.com
2003-11-24 20:54:57 +03:00
parent 5f9718adfb
commit 3d32afd736
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/opt_range.cc
View File

@ -1169,9 +1169,9 @@ end:
DBUG_EXECUTE("info",
{
if (quick_imerge)
print_quick_sel_imerge(quick_imerge, needed_reg);
print_quick_sel_imerge(quick_imerge, &needed_reg);
else
print_quick_sel_range((QUICK_RANGE_SELECT*)quick, needed_reg);
print_quick_sel_range((QUICK_RANGE_SELECT*)quick, &needed_reg);
}
);
@ -1720,7 +1720,6 @@ tree_and(PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2)
uint flag=0;
if (*key1 || *key2)
{
trees_have_key = true;
if (*key1 && !(*key1)->simple_key())
flag|=CLONE_KEY1_MAYBE;
if (*key2 && !(*key2)->simple_key())