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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-26 13:34:38 +03:00
parent 0792aff161 3c92050d1c
commit 6286a05d80
80 changed files with 2760 additions and 2483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/table.cc
View File

@@ -8763,7 +8763,7 @@ int TABLE::update_virtual_fields(handler *h, enum_vcol_update_mode update_mode)
{
/* Compute the actual value of the virtual fields */
DBUG_FIX_WRITE_SET(vf);
# ifndef DBUG_OFF
# ifdef DBUG_TRACE
int field_error=
# endif
vcol_info->expr->save_in_field(vf, 0);