Auto-merge from mysql-next-mr-bugfixing.

b1cc96b3 · Alexander Nozdrin · b3018e86 · a54c49b0 · b1cc96b3 · b1cc96b3
Commit b1cc96b3 authored Feb 24, 2010 by Alexander Nozdrin
3 changed files
--- a/mysql-test/r/perror-win.result
+++ b/mysql-test/r/perror-win.result
@@ -2,5 +2,6 @@ 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).
+MySQL 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
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
--- a/mysql-test/t/perror.test
+++ b/mysql-test/t/perror.test
+--source include/not_windows.inc
 #
 # Check if the variable MY_PERROR is set
 #