diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-11-28 17:15:29 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-11-28 17:15:29 +0400 |
| commit | 3059c95c6502218a2bca593a403220f18c5dc9e7 (patch) | |
| tree | 2319e535ce0ac73d7ad84083ec0ce4e48f8d112f | |
| parent | a0ddfab9ff1a3df1d5e2bb8b1a9d5aefe29952b4 (diff) | |
| parent | 68066aa5a1ebdd4d0072735ee8019029916fccdd (diff) | |
| download | mariadb-git-3059c95c6502218a2bca593a403220f18c5dc9e7.tar.gz | |
automerge
| -rw-r--r-- | mysql-test/r/perror-win.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/perror-win.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/perror-win.result b/mysql-test/r/perror-win.result index 8d3026bc331..1d42235cc14 100644 --- a/mysql-test/r/perror-win.result +++ b/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 diff --git a/mysql-test/t/perror-win.test b/mysql-test/t/perror-win.test index 2b38c5fad54..cc09b8527be 100644 --- a/mysql-test/t/perror-win.test +++ b/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 |