Fix asan bug

santoshbanda · santoshbanda · commit 111e9d45c51e · 2016-10-28T13:45:13.000-07:00
Summary: see title Closes #364 Github Author: Santosh Praneeth Banda <santoshb@fb.com> Github PR Sync: {sync, type="child", parent="github", parentrepo="facebook/mysql-5.6", parentprnum="364", parentprfbid="1239951216066835"} Test Plan: mtr Reviewers: tianx, camerone, svcscm, santoshb Reviewed By: svcscm Subscribers: svcscm, mung, webscalesql-eng@ Differential Revision: https://phabricator.intern.facebook.com/D4097808 Signature: t1:4097808:1477687452:397ce74e45636b8de6533728b34f90634d7bdaff
diff --git a/sql/log_event.cc b/sql/log_event.cc
@@ -14116,6 +14116,11 @@ Rows_query_log_event::Rows_query_log_event(const char *buf, uint event_len,
 
 Rows_query_log_event::~Rows_query_log_event()
 {
+#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
+  // reset the the query set during do_apply_event() before freeing up
+  // the m_rows_query.
+  thd->reset_query();
+#endif
   my_free(m_rows_query);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -14116,6 +14116,11 @@ Rows_query_log_event::Rows_query_log_event(const char *buf, uint event_len,`
`14116`	`14116`
`14117`	`14117`	`Rows_query_log_event::~Rows_query_log_event()`
`14118`	`14118`	`{`
	`14119`	`+#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)`
	`14120`	`+ // reset the the query set during do_apply_event() before freeing up`
	`14121`	`+ // the m_rows_query.`
	`14122`	`+ thd->reset_query();`
	`14123`	`+#endif`
`14119`	`14124`	`my_free(m_rows_query);`
`14120`	`14125`	`}`
`14121`	`14126`