From 170487473e31da4c74a0f2eb915a6b06b19dcb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 26 May 2020 15:46:09 +0300 Subject: After-merge fix: main.perror-win --- mysql-test/main/perror-win.result | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mysql-test/main/perror-win.result') diff --git a/mysql-test/main/perror-win.result b/mysql-test/main/perror-win.result index dcd16d09537..03d43abdb97 100644 --- a/mysql-test/main/perror-win.result +++ b/mysql-test/main/perror-win.result @@ -1,7 +1,7 @@ MariaDB error code 150: Foreign key constraint is incorrectly formed Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed. OS error code 23: Too many open files in system -Win32 error code 23: Data error (cyclic redundancy check). -MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192T' for key %d -Win32 error code 1062: The service has not been started. +Win32 error code 23: Data error (cyclic redundancy check). +MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d +Win32 error code 1062: The service has not been started. Illegal error code: 30000 -- cgit v1.2.1