A patch for BUG#31418: User locks misfunctioning after

mysql_change_user().

The problem was that THD::ull was not reset in THD::cleanup().

The fix is to reset it.

1 files changed, 1 insertions, 0 deletions

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 490aedad0ef..09c8a79c15e 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -698,6 +698,7 @@ void THD::cleanup(void)
     pthread_mutex_lock(&LOCK_user_locks);
     item_user_lock_release(ull);
     pthread_mutex_unlock(&LOCK_user_locks);
+    ull= NULL;
   }
 
   cleanup_done=1;