automerge

mysql-test/r/perror-win.result

@@ -2,5 +2,5 @@ MySQL 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).
-Win32 error code 500: User profile cannot be loaded.
+Win32 error code 1062: The service has not been started.
 Illegal error code: 30000

mysql-test/t/perror-win.test

@@ -8,7 +8,7 @@ enable_query_log;
 
 --exec $MY_PERROR 150 2>&1
 --exec $MY_PERROR 23 2>&1
---exec $MY_PERROR 500 2>&1
+--exec $MY_PERROR 1062 2>&1
 --error 1
 --exec $MY_PERROR 30000 2>&1