mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Applied some patches for Netware.
This commit is contained in:

parent
07417cd309
commit
57b30a1eef
@ -125,6 +125,10 @@ static TYPELIB command_typelib=
|
|||||||
|
|
||||||
static struct my_option my_long_options[] =
|
static struct my_option my_long_options[] =
|
||||||
{
|
{
|
||||||
|
#ifdef __NETWARE__
|
||||||
|
{"autoclose", 'a', " Auto close the screen on exit for NetWare",
|
||||||
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
||||||
|
#endif
|
||||||
{"count", 'c',
|
{"count", 'c',
|
||||||
"Number of iterations to make. This works with -i (--sleep) only.",
|
"Number of iterations to make. This works with -i (--sleep) only.",
|
||||||
(gptr*) &nr_iterations, (gptr*) &nr_iterations, 0, GET_UINT,
|
(gptr*) &nr_iterations, (gptr*) &nr_iterations, 0, GET_UINT,
|
||||||
@ -218,6 +222,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
switch(optid) {
|
switch(optid) {
|
||||||
|
#ifdef __NETWARE__
|
||||||
|
case 'a':
|
||||||
|
setscreenmode(SCR_AUTOCLOSE_ON_EXIT); // auto close the screen /
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
case 'c':
|
case 'c':
|
||||||
opt_count_iterations= 1;
|
opt_count_iterations= 1;
|
||||||
break;
|
break;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# MySQL Error File Compiler
|
# MySQL Error File Compiler
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Error File Compiler"
|
DESCRIPTION "MySQL Error File Compiler"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL ISAM Table Check Tool"
|
SCREENNAME "MySQL ISAM Table Check Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL ISAM Table Check Tool"
|
DESCRIPTION "MySQL ISAM Table Check Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
STACKSIZE 65536
|
STACKSIZE 65536
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# ISAM Log
|
# ISAM Log
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL ISAM Table Log Tool"
|
DESCRIPTION "MySQL ISAM Table Log Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
EXPORT @libmysql.imp
|
EXPORT @libmysql.imp
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Client Library"
|
DESCRIPTION "MySQL Client Library"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
AUTOUNLOAD
|
AUTOUNLOAD
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# My Print Defaults
|
# My Print Defaults
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Print Defaults Tool"
|
DESCRIPTION "MySQL Print Defaults Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL MyISAM Table Dump Tool"
|
SCREENNAME "MySQL MyISAM Table Dump Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL MyISAM Table Dump Tool"
|
DESCRIPTION "MySQL MyISAM Table Dump Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
STACKSIZE 65536
|
STACKSIZE 65536
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL MyISAM Table Check Tool"
|
SCREENNAME "MySQL MyISAM Table Check Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL MyISAM Table Check Tool"
|
DESCRIPTION "MySQL MyISAM Table Check Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
STACKSIZE 65536
|
STACKSIZE 65536
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL MyISAM Table Log Tool"
|
SCREENNAME "MySQL MyISAM Table Log Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL MyISAM Table Log Tool"
|
DESCRIPTION "MySQL MyISAM Table Log Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL MyISAM Table Pack Tool"
|
SCREENNAME "MySQL MyISAM Table Pack Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL MyISAM Table Pack Tool"
|
DESCRIPTION "MySQL MyISAM Table Pack Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Monitor"
|
SCREENNAME "MySQL Monitor"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Monitor"
|
DESCRIPTION "MySQL Monitor"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
MULTIPLE
|
MULTIPLE
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# My Print Defaults
|
# My Print Defaults
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Install Tool"
|
DESCRIPTION "MySQL Install Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Install"
|
SCREENNAME "MySQL Install"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Initial Database Installer"
|
DESCRIPTION "MySQL Initial Database Installer"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
STACKSIZE 65536
|
STACKSIZE 65536
|
||||||
SCREENNAME "MySQL Test Run"
|
SCREENNAME "MySQL Test Run"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Test Run"
|
DESCRIPTION "MySQL Test Run"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
#SCREENNAME "MySQL Tool - Wait for a Program to Terminate"
|
#SCREENNAME "MySQL Tool - Wait for a Program to Terminate"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Tool - Wait for a Program to Terminate"
|
DESCRIPTION "MySQL Tool - Wait for a Program to Terminate"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
STACKSIZE 65536
|
STACKSIZE 65536
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Admin"
|
SCREENNAME "MySQL Admin"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Admin Tool"
|
DESCRIPTION "MySQL Admin Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Binary Log Dump Tool"
|
SCREENNAME "MySQL Binary Log Dump Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Binary Log Dump Tool"
|
DESCRIPTION "MySQL Binary Log Dump Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Check Tool"
|
SCREENNAME "MySQL Check Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Check Tool"
|
DESCRIPTION "MySQL Check Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# MySQL Server
|
# MySQL Server
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Database Server"
|
DESCRIPTION "MySQL Database Server"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
MULTIPLE
|
MULTIPLE
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Database Server"
|
SCREENNAME "MySQL Database Server"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Database Server Monitor"
|
DESCRIPTION "MySQL Database Server Monitor"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
MULTIPLE
|
MULTIPLE
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Dump Tool"
|
SCREENNAME "MySQL Dump Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Dump Tool"
|
DESCRIPTION "MySQL Dump Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Import"
|
SCREENNAME "MySQL Import"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Import Tool"
|
DESCRIPTION "MySQL Import Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
SCREENNAME "MySQL Show"
|
SCREENNAME "MySQL Show"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Show Tool"
|
DESCRIPTION "MySQL Show Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# MySQL Admin
|
# MySQL Admin
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Test Case Tool"
|
DESCRIPTION "MySQL Test Case Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Pack ISAM
|
# Pack ISAM
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL ISAM Table Pack Tool"
|
DESCRIPTION "MySQL ISAM Table Pack Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# PERROR
|
# PERROR
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Error Code Description Tool"
|
DESCRIPTION "MySQL Error Code Description Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Replace
|
# Replace
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Text Replacement Tool"
|
DESCRIPTION "MySQL Text Replacement Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
#SCREENNAME "MySQL Stack Dump Resolve Tool"
|
#SCREENNAME "MySQL Stack Dump Resolve Tool"
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Stack Dump Resolve Tool"
|
DESCRIPTION "MySQL Stack Dump Resolve Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
STACKSIZE 65536
|
STACKSIZE 65536
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Resolve IP
|
# Resolve IP
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL IP/Hostname Resolve Tool"
|
DESCRIPTION "MySQL IP/Hostname Resolve Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
|
@ -149,6 +149,7 @@ static VolumeID_t datavolid;
|
|||||||
static event_handle_t eh;
|
static event_handle_t eh;
|
||||||
static Report_t ref;
|
static Report_t ref;
|
||||||
static void *refneb= NULL;
|
static void *refneb= NULL;
|
||||||
|
my_bool event_flag= FALSE;
|
||||||
static int volumeid= -1;
|
static int volumeid= -1;
|
||||||
|
|
||||||
/* NEB event callback */
|
/* NEB event callback */
|
||||||
@ -819,7 +820,8 @@ static void __cdecl kill_server(int sig_ptr)
|
|||||||
unireg_end();
|
unireg_end();
|
||||||
|
|
||||||
#ifdef __NETWARE__
|
#ifdef __NETWARE__
|
||||||
pthread_join(select_thread, NULL); // wait for main thread
|
if(!event_flag)
|
||||||
|
pthread_join(select_thread, NULL); // wait for main thread
|
||||||
#endif /* __NETWARE__ */
|
#endif /* __NETWARE__ */
|
||||||
|
|
||||||
pthread_exit(0); /* purecov: deadcode */
|
pthread_exit(0); /* purecov: deadcode */
|
||||||
@ -1530,6 +1532,7 @@ static void check_data_home(const char *path)
|
|||||||
// down server event callback
|
// down server event callback
|
||||||
void mysql_down_server_cb(void *, void *)
|
void mysql_down_server_cb(void *, void *)
|
||||||
{
|
{
|
||||||
|
event_flag= TRUE;
|
||||||
kill_server(0);
|
kill_server(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1563,7 +1566,7 @@ void mysql_cb_init()
|
|||||||
Register for volume deactivation event
|
Register for volume deactivation event
|
||||||
Wrap the callback function, as it is called by non-LibC thread
|
Wrap the callback function, as it is called by non-LibC thread
|
||||||
*/
|
*/
|
||||||
(void)NX_WRAP_INTERFACE(neb_event_callback, 1, &refneb);
|
(void *) NX_WRAP_INTERFACE(neb_event_callback, 1, &refneb);
|
||||||
registerwithneb();
|
registerwithneb();
|
||||||
|
|
||||||
NXVmRegisterExitHandler(mysql_cb_destroy, NULL); // clean-up
|
NXVmRegisterExitHandler(mysql_cb_destroy, NULL); // clean-up
|
||||||
@ -1660,6 +1663,7 @@ ulong neb_event_callback(struct EventBlock *eblock)
|
|||||||
{
|
{
|
||||||
consoleprintf("MySQL data volume is deactivated, shutting down MySQL Server \n");
|
consoleprintf("MySQL data volume is deactivated, shutting down MySQL Server \n");
|
||||||
nw_panic = TRUE;
|
nw_panic = TRUE;
|
||||||
|
event_flag= TRUE;
|
||||||
kill_server(0);
|
kill_server(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user