mirror of
https://github.com/MariaDB/server.git
synced 2026-05-17 20:37:12 +02:00
Merge branch '10.5' into 10.6
This commit is contained in:
commit
822694bd56
20 changed files with 213 additions and 27 deletions
|
|
@ -412,7 +412,7 @@
|
|||
#ifdef MRN_MARIADB_P
|
||||
# if (MYSQL_VERSION_ID >= 100203)
|
||||
# define MRN_GENERATED_COLUMNS_UPDATE_VIRTUAL_FIELD(table, field) \
|
||||
(table->update_virtual_field(field))
|
||||
(table->update_virtual_field(field,false))
|
||||
# else
|
||||
# define MRN_GENERATED_COLUMNS_UPDATE_VIRTUAL_FIELD(table, field) \
|
||||
(field->vcol_info->expr_item->save_in_field(field, 0))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue