Bug#20712046: SHOW PROCESSLIST AND PERFORMANCE_SCHEMA TABLES

              DO NOT MASK PASSWORD FROM QUERY

Post-push fix: Fix ASAN test failures.

Change-Id: I9c48959a9e3ff4f01a89d2731e533447e25df66b
Reviewed-by: Erlend Dahl <[email protected]>

Author: jhauglid

sql/sql_parse.cc

@@ -1935,14 +1935,14 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
   thd->proc_info= 0;
   thd->lex->sql_command= SQLCOM_END;
 
-  /* Prevent rewritten query from getting "stuck" in SHOW PROCESSLIST. */
-  thd->rewritten_query.mem_free();
-
   /* Performance Schema Interface instrumentation, end */
   MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
   thd->m_statement_psi= NULL;
   thd->m_digest= NULL;
 
+  /* Prevent rewritten query from getting "stuck" in SHOW PROCESSLIST. */
+  thd->rewritten_query.mem_free();
+
   thd_manager->dec_thread_running();
   free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));