List:Internals« Previous MessageNext Message »
From:jani Date:August 26 2005 12:57pm
Subject:bk commit into 5.0 tree (jani:1.1897)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1897 05/08/26 15:56:52 jani@stripped +34 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

  mysys/charset.c
    1.146 05/08/26 15:56:46 jani@stripped +0 -0
    Merged from 4.1

  client/mysqlbinlog.cc
    1.113 05/08/26 15:56:46 jani@stripped +0 -0
    Merged from 4.1

  client/mysqladmin.cc
    1.110 05/08/26 15:56:46 jani@stripped +0 -1
    Merged from 4.1

  client/client_priv.h
    1.42 05/08/26 15:56:46 jani@stripped +2 -3
    Merged from 4.1

  sql/mysqld.cc
    1.487 05/08/26 15:45:21 jani@stripped +1 -1
    Auto merged

  sql/ha_blackhole.h
    1.5 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  sql/ha_blackhole.cc
    1.15 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysqlshow.def
    1.6 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysqlimport.def
    1.7 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysqldump.def
    1.7 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysqld_safe.c
    1.9 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysqlcheck.def
    1.7 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysqlbinlog.def
    1.7 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysqladmin.def
    1.6 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysql_test_run.c
    1.13 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/mysql.def
    1.6 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  netware/myisamchk.def
    1.7 05/08/26 15:45:20 jani@stripped +0 -0
    Auto merged

  myisam/myisampack.c
    1.46 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  myisam/myisamlog.c
    1.31 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  myisam/myisamchk.c
    1.114 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  include/help_start.h
    1.4 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  include/help_end.h
    1.4 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  extra/resolve_stack_dump.c
    1.17 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  extra/perror.c
    1.41 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  extra/my_print_defaults.c
    1.23 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  client/mysqltest.c
    1.155 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  client/mysqlshow.c
    1.44 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  client/mysqlimport.c
    1.51 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  client/mysqldump.c
    1.195 05/08/26 15:45:19 jani@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834
    1.21 05/08/26 15:45:18 jani@stripped +0 -0
    Auto merged

  client/mysqlcheck.c
    1.49 05/08/26 15:45:18 jani@stripped +0 -0
    Auto merged

  client/mysql.cc
    1.179 05/08/26 15:45:18 jani@stripped +0 -0
    Auto merged

  BitKeeper/etc/config
    1.21 05/08/26 15:45:18 jani@stripped +0 -1
    Auto merged

  BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834
    1.18.2.2 05/08/26 15:45:18 jani@stripped +0 -0
    Merge rename: isam/pack_isam.c -> BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834

  BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f
    1.35 05/08/26 15:45:18 jani@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f
    1.33.1.2 05/08/26 15:45:17 jani@stripped +0 -0
    Merge rename: isam/isamchk.c -> BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0/RESYNC

--- 1.178/client/mysql.cc	2005-08-14 15:06:38 +03:00
+++ 1.179/client/mysql.cc	2005-08-26 15:45:18 +03:00
@@ -526,6 +526,10 @@
    0, 0, 0, 0, 0},
   {"help", 'I', "Synonym for -?", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
    0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"auto-rehash", OPT_AUTO_REHASH,
    "Enable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup and reconnecting may take a longer time. Disable with --disable-auto-rehash.",
    (gptr*) &rehash, (gptr*) &rehash, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
@@ -750,6 +754,11 @@
 	       char *argument)
 {
   switch(optid) {
+#ifdef __NETWARE__
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+    break;
+#endif
   case OPT_CHARSETS_DIR:
     strmov(mysql_charsets_dir, argument);
     charsets_dir = mysql_charsets_dir;

--- 1.109/client/mysqladmin.cc	2005-06-02 07:15:13 +03:00
+++ 1.110/client/mysqladmin.cc	2005-08-26 15:56:46 +03:00
@@ -127,7 +127,7 @@
 static struct my_option my_long_options[] =
 {
 #ifdef __NETWARE__
-  {"autoclose", 'a', " Auto close the screen on exit for NetWare",
+  {"auto-close", OPT_AUTO_CLOSE, "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',
@@ -227,8 +227,8 @@
 
   switch(optid) {
 #ifdef __NETWARE__
-  case 'a':
-    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);      // auto close the screen /
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
     break;
 #endif
   case 'c':

--- 1.194/client/mysqldump.c	2005-08-11 14:02:39 +03:00
+++ 1.195/client/mysqldump.c	2005-08-26 15:45:19 +03:00
@@ -167,6 +167,10 @@
   {"allow-keywords", OPT_KEYWORDS,
    "Allow creation of column names that are keywords.", (gptr*) &opt_keywords,
    (gptr*) &opt_keywords, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"character-sets-dir", OPT_CHARSETS_DIR,
    "Directory where character sets are.", (gptr*) &charsets_dir,
    (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -572,6 +576,11 @@
 	       char *argument)
 {
   switch (optid) {
+#ifdef __NETWARE__
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+    break;
+#endif
   case 'p':
     if (argument)
     {

--- 1.50/client/mysqlimport.c	2004-12-09 15:44:02 +02:00
+++ 1.51/client/mysqlimport.c	2005-08-26 15:45:19 +03:00
@@ -57,6 +57,10 @@
 
 static struct my_option my_long_options[] =
 {
+#ifdef __NETWARE__
+  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"character-sets-dir", OPT_CHARSETS_DIR,
    "Directory where character sets are.", (gptr*) &charsets_dir,
    (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -182,6 +186,11 @@
 	       char *argument)
 {
   switch(optid) {
+#ifdef __NETWARE__
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+    break;
+#endif
   case 'p':
     if (argument)
     {

--- 1.43/client/mysqlshow.c	2005-06-10 22:03:13 +03:00
+++ 1.44/client/mysqlshow.c	2005-08-26 15:45:19 +03:00
@@ -156,6 +156,10 @@
 
 static struct my_option my_long_options[] =
 {
+#ifdef __NETWARE__
+  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"character-sets-dir", 'c', "Directory where character sets are.",
    (gptr*) &charsets_dir, (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0,
    0, 0, 0, 0, 0},
@@ -253,6 +257,11 @@
 	       char *argument)
 {
   switch(optid) {
+#ifdef __NETWARE__
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+    break;
+#endif
   case 'v':
     opt_verbose++;
     break;

--- 1.22/extra/my_print_defaults.c	2005-07-18 15:31:58 +03:00
+++ 1.23/extra/my_print_defaults.c	2005-08-26 15:45:19 +03:00
@@ -71,6 +71,7 @@
 };
 
 
+
 #include <help_start.h>
 
 static void usage(my_bool version)

--- 1.113/myisam/myisamchk.c	2005-07-19 15:13:37 +03:00
+++ 1.114/myisam/myisamchk.c	2005-08-26 15:45:19 +03:00
@@ -155,7 +155,7 @@
   OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE, OPT_SORT_BUFFER_SIZE,
   OPT_SORT_KEY_BLOCKS, OPT_DECODE_BITS, OPT_FT_MIN_WORD_LEN,
   OPT_FT_MAX_WORD_LEN, OPT_FT_STOPWORD_FILE,
-  OPT_MAX_RECORD_LENGTH
+  OPT_MAX_RECORD_LENGTH, OPT_AUTO_CLOSE
 };
 
 static struct my_option my_long_options[] =
@@ -163,6 +163,10 @@
   {"analyze", 'a',
    "Analyze distribution of keys. Will make some joins in MySQL faster. You can check the calculated distribution.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"block-search", 'b',
    "No help available.",
    0, 0, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -469,6 +473,11 @@
 	       char *argument)
 {
   switch (optid) {
+#ifdef __NETWARE__
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+    break;
+#endif
   case 'a':
     if (argument == disabled_my_option)
       check_param.testflag&= ~T_STATISTICS;

--- 1.45/myisam/myisampack.c	2005-08-15 22:37:04 +03:00
+++ 1.46/myisam/myisampack.c	2005-08-26 15:45:19 +03:00
@@ -249,10 +249,14 @@
 #endif
 }
 
-enum options_mp {OPT_CHARSETS_DIR_MP=256};
+enum options_mp {OPT_CHARSETS_DIR_MP=256, OPT_AUTO_CLOSE};
 
 static struct my_option my_long_options[] =
 {
+#ifdef __NETWARE__
+  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"backup", 'b', "Make a backup of the table as table_name.OLD.",
    (gptr*) &backup, (gptr*) &backup, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"character-sets-dir", OPT_CHARSETS_DIR_MP,
@@ -321,6 +325,11 @@
   uint length;
 
   switch(optid) {
+#ifdef __NETWARE__
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+    break;
+#endif
   case 'f':
     force_pack= 1;
     tmpfile_createflag= O_RDWR | O_TRUNC;

--- 1.145/mysys/charset.c	2005-08-25 06:55:40 +03:00
+++ 1.146/mysys/charset.c	2005-08-26 15:56:46 +03:00
@@ -704,7 +704,6 @@
 }
 #endif
 
-
 /*
   Escape apostrophes by doubling them up
 

--- 1.112/client/mysqlbinlog.cc	2005-07-31 22:56:15 +03:00
+++ 1.113/client/mysqlbinlog.cc	2005-08-26 15:56:46 +03:00
@@ -636,6 +636,11 @@
 
 static struct my_option my_long_options[] =
 {
+
+#ifdef __NETWARE__
+  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   /*
     mysqlbinlog needs charsets knowledge, to be able to convert a charset
     number found in binlog to a charset name (to be able to print things
@@ -830,6 +835,11 @@
 {
   bool tty_password=0;
   switch (optid) {
+#ifdef __NETWARE__
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+    break;
+#endif
 #ifndef DBUG_OFF
   case '#':
     DBUG_PUSH(argument ? argument : default_dbug_option);

--- 1.486/sql/mysqld.cc	2005-08-25 19:36:47 +03:00
+++ 1.487/sql/mysqld.cc	2005-08-26 15:45:21 +03:00
@@ -1801,6 +1801,7 @@
     if (!memcmp(&voldata->volID, &datavolid, sizeof(VolumeID_t)))
     {
       consoleprintf("MySQL data volume is deactivated, shutting down MySQL Server \n");
+      event_flag= TRUE;
       nw_panic = TRUE;
       event_flag= TRUE;
       kill_server(0);

--- 1.14/sql/ha_blackhole.cc	2005-07-20 19:02:25 +03:00
+++ 1.15/sql/ha_blackhole.cc	2005-08-26 15:45:20 +03:00
@@ -158,14 +158,16 @@
 }
 
 
+uint ha_blackhole::lock_count(void) const
+{
+  DBUG_RETURN(0);
+}
+
 THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd,
                                          THR_LOCK_DATA **to,
                                          enum thr_lock_type lock_type)
 {
-  if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)
-    lock.type=lock_type;
-  *to++= &lock;
-  return to;
+  DEBUG_RETURN(to);
 }
 
 

--- 1.4/sql/ha_blackhole.h	2005-07-19 21:21:01 +03:00
+++ 1.5/sql/ha_blackhole.h	2005-08-26 15:45:20 +03:00
@@ -78,6 +78,7 @@
   void position(const byte *record);
   void info(uint flag);
   int external_lock(THD *thd, int lock_type);
+  uint lock_count(void) const;
   int create(const char *name, TABLE *table_arg,
              HA_CREATE_INFO *create_info);
   THR_LOCK_DATA **store_lock(THD *thd,

--- 1.6/netware/myisamchk.def	2004-11-30 19:58:13 +02:00
+++ 1.7/netware/myisamchk.def	2005-08-26 15:45:20 +03:00
@@ -2,7 +2,7 @@
 # MyISAM Check
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-SCREENNAME "MySQL MyISAM Table Check Tool"
+SCREENNAME "MySQL MyISAM Table Check Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL MyISAM Table Check Tool"
 VERSION 4, 0

--- 1.5/netware/mysql.def	2004-11-30 19:58:13 +02:00
+++ 1.6/netware/mysql.def	2005-08-26 15:45:20 +03:00
@@ -2,7 +2,7 @@
 # MySQL Client
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-SCREENNAME "MySQL Monitor"
+SCREENNAME "MySQL Monitor[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Monitor"
 VERSION 4, 0

--- 1.12/netware/mysql_test_run.c	2005-06-15 10:24:58 +03:00
+++ 1.13/netware/mysql_test_run.c	2005-08-26 15:45:20 +03:00
@@ -25,6 +25,10 @@
 #include <sys/stat.h>
 #include <sys/mode.h>
 #include "my_manage.h"
+#ifdef __NETWARE__
+#define strindex(a,b) ((char*)strindex(a,b))
+#endif
+
 /******************************************************************************
 
   macros

--- 1.5/netware/mysqladmin.def	2004-11-30 19:58:13 +02:00
+++ 1.6/netware/mysqladmin.def	2005-08-26 15:45:20 +03:00
@@ -2,7 +2,7 @@
 # MySQL Admin
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-SCREENNAME "MySQL Admin"
+SCREENNAME "MySQL Admin[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Admin Tool"
 VERSION 4, 0

--- 1.6/netware/mysqlbinlog.def	2004-11-30 19:58:13 +02:00
+++ 1.7/netware/mysqlbinlog.def	2005-08-26 15:45:20 +03:00
@@ -2,7 +2,7 @@
 # MySQL Binary Log
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-SCREENNAME "MySQL Binary Log Dump Tool"
+SCREENNAME "MySQL Binary Log Dump Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Binary Log Dump Tool"
 VERSION 4, 0

--- 1.6/netware/mysqlcheck.def	2004-11-30 19:58:13 +02:00
+++ 1.7/netware/mysqlcheck.def	2005-08-26 15:45:20 +03:00
@@ -2,7 +2,7 @@
 # MySQL Client
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-SCREENNAME "MySQL Check Tool"
+SCREENNAME "MySQL Check Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Check Tool"
 VERSION 4, 0

--- 1.6/netware/mysqldump.def	2004-11-30 19:58:13 +02:00
+++ 1.7/netware/mysqldump.def	2005-08-26 15:45:20 +03:00
@@ -2,7 +2,7 @@
 # MySQL Admin
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-SCREENNAME "MySQL Dump Tool"
+SCREENNAME "MySQL Dump Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Dump Tool"
 VERSION 4, 0

--- 1.6/netware/mysqlimport.def	2004-11-30 19:58:13 +02:00
+++ 1.7/netware/mysqlimport.def	2005-08-26 15:45:20 +03:00
@@ -2,7 +2,7 @@
 # MySQL Client
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-SCREENNAME "MySQL Import"
+SCREENNAME "MySQL Import[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Import Tool"
 VERSION 4, 0

--- 1.5/netware/mysqlshow.def	2004-11-30 19:58:13 +02:00
+++ 1.6/netware/mysqlshow.def	2005-08-26 15:45:20 +03:00
@@ -2,7 +2,7 @@
 # MySQL Show
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-SCREENNAME "MySQL Show"
+SCREENNAME "MySQL Show[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Show Tool"
 VERSION 4, 0

--- 1.48/client/mysqlcheck.c	2005-08-12 15:09:52 +03:00
+++ 1.49/client/mysqlcheck.c	2005-08-26 15:45:18 +03:00
@@ -62,6 +62,10 @@
    "Instead of issuing one query for each table, use one query per database, naming all tables in the database in a comma-separated list.",
    (gptr*) &opt_all_in_1, (gptr*) &opt_all_in_1, 0, GET_BOOL, NO_ARG, 0, 0, 0,
    0, 0, 0},
+#ifdef __NETWARE__
+  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"auto-repair", OPT_AUTO_REPAIR,
    "If a checked table is corrupted, automatically fix it. Repairing will be done after all tables have been checked, if corrupted ones were found.",
    (gptr*) &opt_auto_repair, (gptr*) &opt_auto_repair, 0, GET_BOOL, NO_ARG, 0,
@@ -221,6 +225,11 @@
 	       char *argument)
 {
   switch(optid) {
+#ifdef __NETWARE__
+  case OPT_AUTO_CLOSE:
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+    break;
+#endif
   case 'a':
     what_to_do = DO_ANALYZE;
     break;

--- 1.41/client/client_priv.h	2005-08-05 20:31:15 +03:00
+++ 1.42/client/client_priv.h	2005-08-26 15:56:46 +03:00
@@ -50,5 +50,6 @@
   OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
 #endif
   OPT_TRIGGERS,
-  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE
+  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
+  OPT_AUTO_CLOSE
 };
Thread
bk commit into 5.0 tree (jani:1.1897)jani26 Aug