revision-id: a96b528e3968ea567fc40e553c00b491380a3e22 (mariadb-10.2.22-77-ga96b528e396) parent(s): e2c769b7106df10d6833863ecc5dfacef9eb88ce b748affcf0724b70b6a54c13b9fa617c118aa043 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-17 09:41:22 +0200 message: Merge branch 'tempesta-tech-sysprg/MDEV-17262' into 10.2 sql/field.cc | 1 - sql/item.cc | 1 - sql/sql_load.cc | 2 +- sql/wsrep_thd.cc | 9 +++++++++ 4 files changed, 10 insertions(+), 3 deletions(-)