Followup:BUG#23479595 SEGMENTATION FAULT WHEN SELECT FTS INDEX TABLES IN

Shaohua Wang · Shaohua Wang · commit 2cb5fee70197 · 2016-06-15T15:06:50.000+02:00
INFORMATION SCHEMA

Fix memory leak issue of i_innodb.fts_IS_tables found by ASAN.
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
@@ -3004,8 +3004,6 @@ i_s_fts_deleted_generic_fill(
 		DBUG_RETURN(0);
 	}
 
-	deleted = fts_doc_ids_create();
-
 	user_table = dict_table_open_on_name(
 		fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE);
 
@@ -3017,6 +3015,8 @@ i_s_fts_deleted_generic_fill(
 		DBUG_RETURN(0);
 	}
 
+	deleted = fts_doc_ids_create();
+
 	trx = trx_allocate_for_background();
 	trx->op_info = "Select for FTS DELETE TABLE";
 

Original file line number	Diff line number	Diff line change
`@@ -3004,8 +3004,6 @@ i_s_fts_deleted_generic_fill(`
`3004`	`3004`	`DBUG_RETURN(0);`
`3005`	`3005`	`}`
`3006`	`3006`
`3007`		`- deleted = fts_doc_ids_create();`
`3008`		`-`
`3009`	`3007`	`user_table = dict_table_open_on_name(`
`3010`	`3008`	`fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE);`
`3011`	`3009`
`@@ -3017,6 +3015,8 @@ i_s_fts_deleted_generic_fill(`
`3017`	`3015`	`DBUG_RETURN(0);`
`3018`	`3016`	`}`
`3019`	`3017`
	`3018`	`+ deleted = fts_doc_ids_create();`
	`3019`	`+`
`3020`	`3020`	`trx = trx_allocate_for_background();`
`3021`	`3021`	`trx->op_info = "Select for FTS DELETE TABLE";`
`3022`	`3022`