Merge from mysql-5.6 to mysql-trunk

aostar · Aug 29, 2014 · 5dadfcb · 5dadfcb
2 parents e49b618 + 3a1d06e
commit 5dadfcb
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
@@ -1255,7 +1255,8 @@ fts_tokenizer_word_get(
 #endif
 
 	/* If it is a stopword, do not index it */
-	if (rbt_search(cache->stopword_info.cached_stopword,
+	if (cache->stopword_info.cached_stopword != NULL
+	    && rbt_search(cache->stopword_info.cached_stopword,
 		       &parent, text) == 0) {
 
 		return(NULL);
@@ -3554,6 +3555,12 @@ fts_add_doc_by_id(
 
 				rw_lock_x_lock(&table->fts->cache->lock);
 
+				if (table->fts->cache->stopword_info.status
+				    & STOPWORD_NOT_INIT) {
+					fts_load_stopword(table, NULL, NULL,
+							  NULL, TRUE, TRUE);
+				}
+
 				fts_cache_add_doc(
 					table->fts->cache,
 					get_doc->index_cache,