BUG#18021306 - ASSERT AT ERROR != DB_SUCCESS in file row0ftsort.cc

Shaohua Wang · Shaohua Wang · commit 59d91fd5cb27 · 2014-01-10T15:51:01.000+08:00
Fix the assert, because child thread can exit in either error or
told by parent.

rb://4290 by Jimmy.Yang
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc
@@ -869,7 +869,9 @@ fts_parallel_tokenization(
 	mutex_exit(&psort_info->mutex);
 
 	if (UT_LIST_GET_LEN(psort_info->fts_doc_list) > 0) {
-		ut_ad(error != DB_SUCCESS);
+		/* child can exit either with error or told by parent. */
+		ut_ad(error != DB_SUCCESS
+		      || psort_info->state == FTS_PARENT_EXITING);
 	}
 
 	/* Free fts doc list in case of error. */

Original file line number	Diff line number	Diff line change
`@@ -869,7 +869,9 @@ fts_parallel_tokenization(`
`869`	`869`	`mutex_exit(&psort_info->mutex);`
`870`	`870`
`871`	`871`	`if (UT_LIST_GET_LEN(psort_info->fts_doc_list) > 0) {`
`872`		`- ut_ad(error != DB_SUCCESS);`
	`872`	`+ /* child can exit either with error or told by parent. */`
	`873`	`+ ut_ad(error != DB_SUCCESS`
	`874`	`+ \|\| psort_info->state == FTS_PARENT_EXITING);`
`873`	`875`	`}`
`874`	`876`
`875`	`877`	`/* Free fts doc list in case of error. */`