database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-04 16:58:42 +02:00
parent 558f1eff64 3b071bad19
commit ee620a7416
28 changed files with 645 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/opt_range.cc
View File

@@ -1901,7 +1901,9 @@ inline void SEL_ARG::make_root()
left=right= &null_element;
color=BLACK;
next=prev=0;
use_count=0; elements=1;
use_count=0;
elements=1;
weight= 1 + (next_key_part? next_key_part->weight : 0);
}
SEL_ARG::SEL_ARG(Field *f,const uchar *min_value_arg,
@@ -16162,6 +16164,7 @@ const char *dbug_print_sel_arg(SEL_ARG *sel_arg)
out.append(STRING_WITH_LEN("+inf"));
else
{
buf.length(0);
print_sel_arg_key(sel_arg->field, sel_arg->max_value, &buf);
out.append(buf);
}