summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2008-11-27 14:45:41 +0100
committerTatiana A. Nurnberg <azundris@mysql.com>2008-11-27 14:45:41 +0100
commit238c5bfa2f031d09bc41c0b772f827ce53e8cd58 (patch)
tree01d579d92bcb762cf2d8ce43de101749a3d3e7c6 /mysql-test
parentd57c7dcff89c16cc39941fe9991127d0ae6131bc (diff)
parent7b488c46a0882d2e8cc2ab5f2ff57722c395594a (diff)
downloadmariadb-git-238c5bfa2f031d09bc41c0b772f827ce53e8cd58.tar.gz
auto-merge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/perror-win.result5
-rw-r--r--mysql-test/t/perror-win.test11
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/perror-win.result b/mysql-test/r/perror-win.result
new file mode 100644
index 00000000000..61e6fcaab4e
--- /dev/null
+++ b/mysql-test/r/perror-win.result
@@ -0,0 +1,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 15000: The specified channel path is invalid.
diff --git a/mysql-test/t/perror-win.test b/mysql-test/t/perror-win.test
new file mode 100644
index 00000000000..56615e72a5a
--- /dev/null
+++ b/mysql-test/t/perror-win.test
@@ -0,0 +1,11 @@
+# Windows-specific tests
+--source include/windows.inc
+--require r/have_perror.require
+disable_query_log;
+eval select LENGTH("$MY_PERROR") > 0 as "have_perror";
+enable_query_log;
+
+
+--exec $MY_PERROR 150
+--exec $MY_PERROR 23
+--exec $MY_PERROR 15000