database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.4' into 10.5

Browse Source
This commit is contained in:
Alexander Barkov
2020-05-19 12:36:58 +04:00
parent 3ea05d0842 810b7f8ecb
commit 49b29e35b2
8 changed files with 190 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_tvc.cc
View File

@ -59,7 +59,8 @@ bool fix_fields_for_tvc(THD *thd, List_iterator_fast<List_item> &li)
while replacing their values to NAME_CONST()s.
So fix only those that have not been.
*/
if (item->fix_fields_if_needed(thd, 0))
if (item->fix_fields_if_needed(thd, 0) ||
item->check_is_evaluable_expression_or_error())
DBUG_RETURN(true);
}
}