diff options
author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-08-28 11:38:18 +0300 |
---|---|---|
committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-08-28 11:38:18 +0300 |
commit | e239939ebff7d63f37858fc8917fb4b7523835ad (patch) | |
tree | d2f5b0e2418e17e7ab56b884ebd4e7b97c9a7233 /netware | |
parent | 9f5ef4a1594edfef1d14caf1baa34f0acd50987a (diff) | |
download | mariadb-git-e239939ebff7d63f37858fc8917fb4b7523835ad.tar.gz |
Applied a couple of Netware related patches.
netware/mysql_test_run.c:
- Added missing cast to resolve compilation issues.
- run_test() in mysql_test_run.c needs to check the correct
error value returned by abort_not_supported_test(). This
resolves the problem with skipped test cases on NetWare,
which are supposed to be marked 'skip' instead of 'bad'.
netware/mysqladmin.def:
Increased stack size to avoid stack overflow in mysqladmin.NLM
Diffstat (limited to 'netware')
-rw-r--r-- | netware/mysql_test_run.c | 3 | ||||
-rw-r--r-- | netware/mysqladmin.def | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index 2b9522ff57d..7ca242178ff 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -27,6 +27,7 @@ #include "my_manage.h" #ifdef __NETWARE__ #define strindex(a,b) ((char*)strindex(a,b)) +#define strstr(a,b) ((char*)strstr(a,b)) #endif /****************************************************************************** @@ -943,7 +944,7 @@ void run_test(char *test) // increment total ++total_test; } - else if (err == 2) + else if (err == 62) { // skip rstr = TEST_SKIP; diff --git a/netware/mysqladmin.def b/netware/mysqladmin.def index cfab4f4c23d..e7f2d90bf9e 100644 --- a/netware/mysqladmin.def +++ b/netware/mysqladmin.def @@ -6,6 +6,7 @@ SCREENNAME "MySQL Admin[scrollable]" COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Admin Tool" VERSION 4, 0 +STACKSIZE 32767 XDCDATA ../netware/mysql.xdc #DEBUG |