summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@sun.com>2010-02-24 00:22:19 -0700
committerMarc Alff <marc.alff@sun.com>2010-02-24 00:22:19 -0700
commitf5070c2616d6532564fb5d9baa95a18e65f8115f (patch)
treefb85d765d6a7583bf4a86922e55178e8842f36d5
parent5994f28470c0a2d9fbef329062f482fd0a40243b (diff)
downloadmariadb-git-f5070c2616d6532564fb5d9baa95a18e65f8115f.tar.gz
Fixed tests for windows
-rw-r--r--mysql-test/r/perror-win.result1
-rw-r--r--mysql-test/t/perror.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/perror-win.result b/mysql-test/r/perror-win.result
index 1d42235cc14..139b566757f 100644
--- 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
diff --git a/mysql-test/t/perror.test b/mysql-test/t/perror.test
index df0779139f0..2b9907c0542 100644
--- a/mysql-test/t/perror.test
+++ b/mysql-test/t/perror.test
@@ -1,3 +1,4 @@
+--source include/not_windows.inc
#
# Check if the variable MY_PERROR is set
#