summaryrefslogtreecommitdiff
path: root/mysys/default.c
diff options
context:
space:
mode:
authorunknown <greg@mysql.com>2003-03-21 16:45:39 -0500
committerunknown <greg@mysql.com>2003-03-21 16:45:39 -0500
commit2ec4163759bc19f5fc03cd5a0b1072afcdb16947 (patch)
tree6204247b50ae737bead82de5fdfbc3bdd63689b1 /mysys/default.c
parent0f18ab78970cd64418646e83a32d7e487477fb86 (diff)
downloadmariadb-git-2ec4163759bc19f5fc03cd5a0b1072afcdb16947.tar.gz
Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC
client/mysql.cc: Remove unnecessary pthread_yield calls for NetWare client/mysqldump.c: Remove unnecessary pthread_yield calls for NetWare include/my_pthread.h: Special extern my_pthread_cond_timedwait no longer required for NetWare mysql-test/t/backup.test: replace_result added so test passes correctly on NetWare mysys/default.c: Add conditional to avoid non-applicable file checking on NetWare mysys/my_init.c: Remove working directory change from netware_init() mysys/my_pthread.c: Remove unnecessary NetWare version of my_pthread_cond_timedwait mysys/thr_mutex.c: Remove unnecessary NetWare block scripts/make_binary_distribution.sh: Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections
Diffstat (limited to 'mysys/default.c')
-rw-r--r--mysys/default.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c
index cfdda17fb5f..a3942425b7d 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -244,7 +244,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
strmov(name,config_file);
}
fn_format(name,name,"","",4);
-#if !defined(__WIN__) && !defined(OS2)
+#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))