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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-03-29 12:59:18 +03:00
parent 9d6d122123 088b37b5ea
commit d62b0368ca
86 changed files with 2875 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_view.cc
View File

@ -96,7 +96,8 @@ static void make_unique_view_field_name(THD *thd, Item *target,
itc.rewind();
}
target->orig_name= target->name.str;
if (!target->orig_name)
target->orig_name= target->name.str;
target->set_name(thd, buff, name_len, system_charset_info);
}