diff options
| author | Ingo Struewing <ingo.struewing@sun.com> | 2008-11-28 15:01:09 +0100 |
|---|---|---|
| committer | Ingo Struewing <ingo.struewing@sun.com> | 2008-11-28 15:01:09 +0100 |
| commit | f525d35b51ac32c4fad28d88f3254a77b2cea4e8 (patch) | |
| tree | fe00b309e2f5a78fefc6e889e9814e883450a118 | |
| parent | 8e9e95f2d79a44520848d8023f7c459f3d5730e9 (diff) | |
| parent | be1e99281241539b34e374529716f8eb162f4786 (diff) | |
| download | mariadb-git-f525d35b51ac32c4fad28d88f3254a77b2cea4e8.tar.gz | |
merge
.bzrignore:
Added autom4te.cache and language directories in sql/share to ignorefile.
| -rw-r--r-- | .bzrignore | 25 | ||||
| -rw-r--r-- | mysql-test/r/perror-win.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/perror-win.test | 2 |
3 files changed, 27 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 118cd845212..8ea3b361c87 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3032,3 +3032,28 @@ mysql-test/bug36522.tar mysql-test/t.log mysql-test/tps.log libmysqld/event_parse_data.cc +autom4te.cache +sql/share/czech +sql/share/danish +sql/share/dutch +sql/share/english +sql/share/estonian +sql/share/french +sql/share/german +sql/share/greek +sql/share/hungarian +sql/share/italian +sql/share/japanese +sql/share/japanese-sjis +sql/share/korean +sql/share/norwegian +sql/share/norwegian-ny +sql/share/polish +sql/share/portuguese +sql/share/romanian +sql/share/russian +sql/share/serbian +sql/share/slovak +sql/share/spanish +sql/share/swedish +sql/share/ukrainian 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 |