diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:13:30 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:13:30 -0300 |
commit | 07e7b4d6fe590cb49a5009842d3153520f2e1a36 (patch) | |
tree | 2c9b96009bfea8eef82d21e14a61f7306827f917 /mysys/my_init.c | |
parent | ef27448469171b0d7a045b19af378af9b514b6af (diff) | |
download | mariadb-git-07e7b4d6fe590cb49a5009842d3153520f2e1a36.tar.gz |
WL#5486: Remove code for unsupported platforms
Remove Netware specific code.
Diffstat (limited to 'mysys/my_init.c')
-rw-r--r-- | mysys/my_init.c | 65 |
1 files changed, 1 insertions, 64 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 41a2efe0b90..06f4fa2b6a5 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -36,11 +36,6 @@ static my_bool win32_init_tcp_ip(); #else #define my_win_init() #endif -#ifdef __NETWARE__ -static void netware_init(); -#else -#define netware_init() -#endif my_bool my_init_done= 0; /** True if @c my_basic_init() has been called. */ @@ -109,7 +104,6 @@ my_bool my_basic_init(void) #if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX) fastmutex_global_init(); /* Must be called early */ #endif - netware_init(); #ifdef THREAD #if defined(HAVE_PTHREAD_INIT) pthread_init(); /* Must be called before DBUG_ENTER */ @@ -150,7 +144,7 @@ my_bool my_init(void) #ifdef THREAD if (my_thread_global_init()) return 1; -#if !defined( __WIN__) && !defined(__NETWARE__) +#if !defined(__WIN__) sigfillset(&my_signals); /* signals blocked by mf_brkhant */ #endif #endif /* THREAD */ @@ -239,9 +233,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", rus.ru_msgsnd, rus.ru_msgrcv, rus.ru_nsignals, rus.ru_nvcsw, rus.ru_nivcsw); #endif -#if defined(__NETWARE__) && !defined(__WIN__) - fprintf(info_file,"\nRun time: %.1f\n",(double) clock()/CLOCKS_PER_SEC); -#endif #if defined(__WIN__) && defined(_MSC_VER) _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); @@ -524,60 +515,6 @@ static my_bool win32_init_tcp_ip() } #endif /* __WIN__ */ - -#ifdef __NETWARE__ -/* - Basic initialisation for netware -*/ - -static void netware_init() -{ - char cwd[PATH_MAX], *name; - - DBUG_ENTER("netware_init"); - - /* init only if we are not a client library */ - if (my_progname) - { -#if SUPPORTED_BY_LIBC /* Removed until supported in Libc */ - struct termios tp; - /* Disable control characters */ - tcgetattr(STDIN_FILENO, &tp); - tp.c_cc[VINTR] = _POSIX_VDISABLE; - tp.c_cc[VEOF] = _POSIX_VDISABLE; - tp.c_cc[VSUSP] = _POSIX_VDISABLE; - tcsetattr(STDIN_FILENO, TCSANOW, &tp); -#endif /* SUPPORTED_BY_LIBC */ - - /* With stdout redirection */ - if (!isatty(STDOUT_FILENO)) - { - setscreenmode(SCR_AUTOCLOSE_ON_EXIT); /* auto close the screen */ - } - else - { - setscreenmode(SCR_NO_MODE); /* keep the screen up */ - } - - /* Parse program name and change to base format */ - name= (char*) my_progname; - for (; *name; name++) - { - if (*name == '\\') - { - *name = '/'; - } - else - { - *name = tolower(*name); - } - } - } - - DBUG_VOID_RETURN; -} -#endif /* __NETWARE__ */ - #ifdef HAVE_PSI_INTERFACE #if !defined(HAVE_PREAD) && !defined(_WIN32) |