diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-30 09:34:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-30 09:34:07 +0300 |
| commit | 5c69e936308b9b636d3e58aff624d2716f289fbd (patch) | |
| tree | c04c8a4d2a160977b027d0c1b3acc44a70f53301 /sql/sql_view.cc | |
| parent | 88ce8a3d8be0346b325bc4da75894cd15e255857 (diff) | |
| parent | a4d753758fd5305853ba339a0cd57d1675d5aa8c (diff) | |
| download | mariadb-git-5c69e936308b9b636d3e58aff624d2716f289fbd.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index e5bea13896a..9f9ef6335f3 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -100,7 +100,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); } |