Merge

mysql-test/r/fulltext.result:
  SCCS merged
mysql-test/t/fulltext.test:
  SCCS merged

mysql-test/r/fulltext.result

@@ -402,6 +402,12 @@ select count(*) from t1;
 count(*)
 1
 drop table t1;
+CREATE TABLE t1 ( a TEXT, FULLTEXT (a) );
+INSERT INTO t1 VALUES ('testing ft_nlq_find_relevance');
+SELECT MATCH(a) AGAINST ('nosuchword') FROM t1;
+MATCH(a) AGAINST ('nosuchword')
+0
+DROP TABLE t1;
 create table t1 (a int primary key, b text, fulltext(b));
 create table t2 (a int, b text);
 insert t1 values (1, "aaaa"), (2, "bbbb");

mysql-test/t/fulltext.test

@@ -309,6 +309,14 @@ REPAIR TABLE t1;
 select count(*) from t1;
 drop table t1;
 
+#
+# testing out of bounds memory access in ft_nlq_find_relevance()
+# (bug#8522); visible in valgrind.
+#
+CREATE TABLE t1 ( a TEXT, FULLTEXT (a) );
+INSERT INTO t1 VALUES ('testing ft_nlq_find_relevance');
+SELECT MATCH(a) AGAINST ('nosuchword') FROM t1;
+DROP TABLE t1;
 #
 # bug#6784
 # mi_flush_bulk_insert (on dup key error in mi_write)