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

e6a28b29 · Vladislav Vaintroub · 58bff40d · 9cdc6bcf · e6a28b29 · e6a28b29
Commit e6a28b29 authored Apr 01, 2017 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

mysql-test/r/lowercase_fs_on.result mysql-test/r/lowercase_fs_on.result +2 -1

mysql-test/r/named_pipe.result mysql-test/r/named_pipe.result +2 -1

No files found.
--- a/mysql-test/r/lowercase_fs_on.result
+++ b/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
+
--- a/mysql-test/r/named_pipe.result
+++ b/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
+