mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge mariadb-10.5.21 into 10.5
This commit is contained in:
@ -7569,6 +7569,7 @@ best_access_path(JOIN *join,
|
||||
if (s->table->is_splittable())
|
||||
spl_plan= s->choose_best_splitting(idx,
|
||||
remaining_tables,
|
||||
join_positions,
|
||||
&spl_pd_boundary);
|
||||
|
||||
Json_writer_array trace_paths(thd, "considered_access_paths");
|
||||
@ -28471,7 +28472,7 @@ void st_select_lex::print_set_clause(THD *thd, String *str,
|
||||
else
|
||||
str->append(',');
|
||||
|
||||
item->print(str, query_type);
|
||||
item->print(str, (enum_query_type) (query_type | QT_NO_DATA_EXPANSION));
|
||||
str->append(STRING_WITH_LEN(" = "));
|
||||
val->print(str, query_type);
|
||||
}
|
||||
|
Reference in New Issue
Block a user