Merge branch 'bb-10.2-mariarocks' into bb-10.2-mariarocks-wlad

mysql-test/r/lowercase_fs_on.result

 #
 # Bug#20198490 : LOWER_CASE_TABLE_NAMES=0 ON WINDOWS LEADS TO PROBLEMS
 #
-FOUND /\[ERROR\] The server option \'lower_case_table_names\' is configured to use case sensitive table names/ in my_restart.err
+FOUND 1 /\[ERROR\] The server option \'lower_case_table_names\' is configured to use case sensitive table names/ in my_restart.err
+

mysql-test/r/named_pipe.result

@@ -2157,4 +2157,5 @@ Warning	1052	Column 'kundentyp' in group statement is ambiguous
 drop table t1;
 connection default;
 disconnect pipe_con;
-FOUND /\[ERROR\] Create named pipe failed/ in second-mysqld.err
+FOUND 1 /\[ERROR\] Create named pipe failed/ in second-mysqld.err
+