Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b09068f8
Commit
b09068f8
authored
Nov 29, 2004
by
jani@a193-229-222-105.elisa-laajakaista.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Applied some Netware related patches.
parent
fed60198
Changes
30
Show whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
52 additions
and
38 deletions
+52
-38
client/mysqladmin.cc
client/mysqladmin.cc
+9
-0
netware/comp_err.def
netware/comp_err.def
+1
-1
netware/isamchk.def
netware/isamchk.def
+1
-1
netware/isamlog.def
netware/isamlog.def
+1
-1
netware/libmysql.def
netware/libmysql.def
+1
-1
netware/my_print_defaults.def
netware/my_print_defaults.def
+1
-1
netware/myisam_ftdump.def
netware/myisam_ftdump.def
+1
-1
netware/myisamchk.def
netware/myisamchk.def
+1
-1
netware/myisamlog.def
netware/myisamlog.def
+1
-1
netware/myisampack.def
netware/myisampack.def
+1
-1
netware/mysql.def
netware/mysql.def
+1
-1
netware/mysql_install.def
netware/mysql_install.def
+1
-1
netware/mysql_install_db.def
netware/mysql_install_db.def
+1
-1
netware/mysql_test_run.def
netware/mysql_test_run.def
+1
-1
netware/mysql_waitpid.def
netware/mysql_waitpid.def
+1
-1
netware/mysqladmin.def
netware/mysqladmin.def
+1
-1
netware/mysqlbinlog.def
netware/mysqlbinlog.def
+1
-1
netware/mysqlcheck.def
netware/mysqlcheck.def
+1
-1
netware/mysqld.def
netware/mysqld.def
+1
-1
netware/mysqld_safe.def
netware/mysqld_safe.def
+1
-1
netware/mysqldump.def
netware/mysqldump.def
+1
-1
netware/mysqlimport.def
netware/mysqlimport.def
+1
-1
netware/mysqlshow.def
netware/mysqlshow.def
+1
-1
netware/mysqltest.def
netware/mysqltest.def
+1
-1
netware/pack_isam.def
netware/pack_isam.def
+1
-1
netware/perror.def
netware/perror.def
+1
-1
netware/replace.def
netware/replace.def
+1
-1
netware/resolve_stack_dump.def
netware/resolve_stack_dump.def
+1
-1
netware/resolveip.def
netware/resolveip.def
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+15
-10
No files found.
client/mysqladmin.cc
View file @
b09068f8
...
@@ -125,6 +125,10 @@ static TYPELIB command_typelib=
...
@@ -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)),
...
@@ -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
;
...
...
netware/comp_err.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/isamchk.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/isamlog.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/libmysql.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/my_print_defaults.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/myisam_ftdump.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/myisamchk.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/myisamlog.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/myisampack.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysql.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysql_install.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/mysql_install_db.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysql_test_run.def
View file @
b09068f8
...
@@ -4,7 +4,7 @@
...
@@ -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
...
...
netware/mysql_waitpid.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysqladmin.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysqlbinlog.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysqlcheck.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysqld.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/mysqld_safe.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysqldump.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysqlimport.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysqlshow.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/mysqltest.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/pack_isam.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/perror.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/replace.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
netware/resolve_stack_dump.def
View file @
b09068f8
...
@@ -3,7 +3,7 @@
...
@@ -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
...
...
netware/resolveip.def
View file @
b09068f8
...
@@ -2,7 +2,7 @@
...
@@ -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
...
...
sql/mysqld.cc
View file @
b09068f8
...
@@ -146,6 +146,7 @@ static VolumeID_t datavolid;
...
@@ -146,6 +146,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 */
...
@@ -815,6 +816,7 @@ static void __cdecl kill_server(int sig_ptr)
...
@@ -815,6 +816,7 @@ static void __cdecl kill_server(int sig_ptr)
else
else
unireg_end
();
unireg_end
();
#ifdef __NETWARE__
#ifdef __NETWARE__
if
(
!
event_flag
)
pthread_join
(
select_thread
,
NULL
);
// wait for main thread
pthread_join
(
select_thread
,
NULL
);
// wait for main thread
#endif
/* __NETWARE__ */
#endif
/* __NETWARE__ */
...
@@ -1525,6 +1527,7 @@ static void check_data_home(const char *path)
...
@@ -1525,6 +1527,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
);
}
}
...
@@ -1534,7 +1537,6 @@ void mysql_cb_destroy(void *)
...
@@ -1534,7 +1537,6 @@ void mysql_cb_destroy(void *)
{
{
UnRegisterEventNotification
(
eh
);
// cleanup down event notification
UnRegisterEventNotification
(
eh
);
// cleanup down event notification
NX_UNWRAP_INTERFACE
(
ref
);
NX_UNWRAP_INTERFACE
(
ref
);
/* Deregister NSS volume deactivation event */
/* Deregister NSS volume deactivation event */
NX_UNWRAP_INTERFACE
(
refneb
);
NX_UNWRAP_INTERFACE
(
refneb
);
if
(
neb_consumer_id
)
if
(
neb_consumer_id
)
...
@@ -1558,7 +1560,7 @@ void mysql_cb_init()
...
@@ -1558,7 +1560,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
...
@@ -1655,7 +1657,9 @@ ulong neb_event_callback(struct EventBlock *eblock)
...
@@ -1655,7 +1657,9 @@ 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
);
}
}
}
}
return
0
;
return
0
;
...
@@ -1729,8 +1733,8 @@ static void init_signals(void)
...
@@ -1729,8 +1733,8 @@ static void init_signals(void)
for
(
uint
i
=
0
;
i
<
sizeof
(
signals
)
/
sizeof
(
int
)
;
i
++
)
for
(
uint
i
=
0
;
i
<
sizeof
(
signals
)
/
sizeof
(
int
)
;
i
++
)
signal
(
signals
[
i
],
kill_server
);
signal
(
signals
[
i
],
kill_server
);
mysql_cb_init
();
// initialize callbacks
mysql_cb_init
();
// initialize callbacks
}
}
static
void
start_signal_handler
(
void
)
static
void
start_signal_handler
(
void
)
{
{
...
@@ -3058,6 +3062,7 @@ we force server id to 2, but this MySQL server will not act as a slave.");
...
@@ -3058,6 +3062,7 @@ we force server id to 2, but this MySQL server will not act as a slave.");
#endif
#endif
clean_up_mutexes
();
clean_up_mutexes
();
my_end
(
opt_endinfo
?
MY_CHECK_ERROR
|
MY_GIVE_INFO
:
0
);
my_end
(
opt_endinfo
?
MY_CHECK_ERROR
|
MY_GIVE_INFO
:
0
);
exit
(
0
);
exit
(
0
);
return
(
0
);
/* purecov: deadcode */
return
(
0
);
/* purecov: deadcode */
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment