diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-11-28 15:04:09 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-11-28 15:04:09 +0400 |
| commit | 710b7125da52c4636ca4e5b963b376a7195656af (patch) | |
| tree | 360767a2b1c06525287b35bd01f1458a1b6945f4 /mysql-test | |
| parent | 901298e10953c8a8fa2d4575a5017090ebeb76f9 (diff) | |
| parent | 78119b2d04457abe94f2a0a9f3d887c0eb9210a5 (diff) | |
| download | mariadb-git-710b7125da52c4636ca4e5b963b376a7195656af.tar.gz | |
5.0-bugteam->5.1-bugteam merge
sql/slave.cc:
compiler warning fix
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/perror-win.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/perror-win.test | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/mysql-test/r/perror-win.result b/mysql-test/r/perror-win.result index 61e6fcaab4e..8d3026bc331 100644 --- a/mysql-test/r/perror-win.result +++ b/mysql-test/r/perror-win.result @@ -1,5 +1,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. +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. +Win32 error code 23: Data error (cyclic redundancy check).
+Win32 error code 500: User profile cannot be loaded.
+Illegal error code: 30000 diff --git a/mysql-test/t/perror-win.test b/mysql-test/t/perror-win.test index 56615e72a5a..2b38c5fad54 100644 --- a/mysql-test/t/perror-win.test +++ b/mysql-test/t/perror-win.test @@ -6,6 +6,9 @@ eval select LENGTH("$MY_PERROR") > 0 as "have_perror"; enable_query_log; ---exec $MY_PERROR 150 ---exec $MY_PERROR 23 ---exec $MY_PERROR 15000 +--exec $MY_PERROR 150 2>&1 +--exec $MY_PERROR 23 2>&1 +--exec $MY_PERROR 500 2>&1 +--error 1 +--exec $MY_PERROR 30000 2>&1 + |