1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge 10.2 (up to commit ef00ac4c86) into 10.3

This commit is contained in:
Alexander Barkov
2019-09-04 09:55:59 +04:00
44 changed files with 1825 additions and 23 deletions

View File

@ -2624,7 +2624,8 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
sizeof(MY_BITMAP)))))
goto error;
if (unlikely(parse_vcol_defs(client_thd, client_thd->mem_root, copy,
&error_reported)))
&error_reported,
VCOL_INIT_DEPENDENCY_FAILURE_IS_WARNING)))
goto error;
}