From 52c40b406d5a68bf774a75dc6fa9ef1c166b22b1 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Fri, 22 Dec 2017 22:12:52 +0200
Subject: [PATCH] Initialize MYSQL_LOCK->flags variable

This could crash in mysql_unlock_tables in servers compiled with DBUG
---
 sql/lock.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/lock.cc b/sql/lock.cc
index f4fc09d35bf..11cadb528d2 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -673,6 +673,7 @@ MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b)
   sql_lock->table_count=a->table_count+b->table_count;
   sql_lock->locks=(THR_LOCK_DATA**) (sql_lock+1);
   sql_lock->table=(TABLE**) (sql_lock->locks+sql_lock->lock_count*2);
+  sql_lock->flags= 0;
   memcpy(sql_lock->locks,a->locks,a->lock_count*sizeof(*a->locks));
   memcpy(sql_lock->locks+a->lock_count,b->locks,
 	 b->lock_count*sizeof(*b->locks));