Commit 16ae922e authored by unknown's avatar unknown
Browse files

Applied some patches for Netware. 


client/mysqladmin.cc:
  Added option to close the screen on exit for Netware.
netware/comp_err.def:
  Copyright notice change, for Netware.
netware/isamchk.def:
  Copyright notice change, for Netware.
netware/isamlog.def:
  Copyright notice change, for Netware.
netware/libmysql.def:
  Copyright notice change, for Netware.
netware/my_print_defaults.def:
  Copyright notice change, for Netware.
netware/myisam_ftdump.def:
  Copyright notice change, for Netware.
netware/myisamchk.def:
  Copyright notice change, for Netware.
netware/myisamlog.def:
  Copyright notice change, for Netware.
netware/myisampack.def:
  Copyright notice change, for Netware.
netware/mysql.def:
  Copyright notice change, for Netware.
netware/mysql_install.def:
  Copyright notice change, for Netware.
netware/mysql_install_db.def:
  Copyright notice change, for Netware.
netware/mysql_test_run.def:
  Copyright notice change, for Netware.
netware/mysql_waitpid.def:
  Copyright notice change, for Netware.
netware/mysqladmin.def:
  Copyright notice change, for Netware.
netware/mysqlbinlog.def:
  Copyright notice change, for Netware.
netware/mysqlcheck.def:
  Copyright notice change, for Netware.
netware/mysqld.def:
  Copyright notice change, for Netware.
netware/mysqld_safe.def:
  Copyright notice change, for Netware.
netware/mysqldump.def:
  Copyright notice change, for Netware.
netware/mysqlimport.def:
  Copyright notice change, for Netware.
netware/mysqlshow.def:
  Copyright notice change, for Netware.
netware/mysqltest.def:
  Copyright notice change, for Netware.
netware/pack_isam.def:
  Copyright notice change, for Netware.
netware/perror.def:
  Copyright notice change, for Netware.
netware/replace.def:
  Copyright notice change, for Netware.
netware/resolve_stack_dump.def:
  Copyright notice change, for Netware.
netware/resolveip.def:
  Copyright notice change, for Netware.
sql/mysqld.cc:
  Changes to fix the abend on NetWare on recieving the server down and volume deactivation
  events. Do not join for the main thread if these events occur.
parent a94df6ee

client/mysqladmin.cc

+9 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ static TYPELIB command_typelib= 


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',

   "Number of iterations to make. This works with -i (--sleep) only.",

   (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;



  switch(optid) {

#ifdef __NETWARE__

  case 'a':

    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);      // auto close the screen /

    break;

#endif

  case 'c':

    opt_count_iterations= 1;

    break;

netware/comp_err.def

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# MySQL Error File Compiler

#------------------------------------------------------------------------------

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"

VERSION 4, 0

XDCDATA ../netware/mysql.xdc

netware/isamchk.def

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#------------------------------------------------------------------------------

MODULE	libc.nlm

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"

VERSION 4, 0

STACKSIZE 65536

netware/isamlog.def

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# ISAM Log

#------------------------------------------------------------------------------

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"

VERSION 4, 0

XDCDATA ../netware/mysql.xdc

netware/libmysql.def

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#------------------------------------------------------------------------------

MODULE	libc.nlm

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"

VERSION 4, 0

AUTOUNLOAD