Merge bk-internal:/home/bk/mysql-5.0

into mysql.com:/home/jimw/my/mysql-5.0-clean

client/mysqltest.c

@@ -2321,6 +2321,9 @@ static struct my_option my_long_options[] =
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
+
+#include <help_start.h>
+
 static void print_version(void)
 {
   printf("%s  Ver %s Distrib %s, for %s (%s)\n",my_progname,MTEST_VERSION,
@@ -2339,6 +2342,8 @@ void usage()
   my_print_variables(my_long_options);
 }
 
+#include <help_end.h>
+
 
 static my_bool
 get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

extra/my_print_defaults.c

@@ -55,6 +55,9 @@ static struct my_option my_long_options[] =
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
+
+#include <help_start.h>
+
 static void usage(my_bool version)
 {
   printf("%s  Ver 1.6 for %s at %s\n",my_progname,SYSTEM_TYPE,
@@ -69,6 +72,8 @@ static void usage(my_bool version)
   printf("\nExample usage:\n%s --config-file=my client mysql\n", my_progname);
 }
 
+#include <help_end.h>
+
 
 static my_bool
 get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

extra/perror.c

@@ -113,12 +113,15 @@ static HA_ERRORS ha_errlist[]=
 };
 
 
+#include <help_start.h>
+
 static void print_version(void)
 {
   printf("%s Ver %s, for %s (%s)\n",my_progname,PERROR_VERSION,
 	 SYSTEM_TYPE,MACHINE_TYPE);
 }
 
+
 static void usage(void)
 {
   print_version();
@@ -130,6 +133,8 @@ static void usage(void)
   my_print_variables(my_long_options);
 }
 
+#include <help_end.h>
+
 
 static my_bool
 get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

extra/resolve_stack_dump.c

@@ -65,12 +65,16 @@ static struct my_option my_long_options[] =
 
 static void verify_sort();
 
+
+#include <help_start.h>
+
 static void print_version(void)
 {
   printf("%s  Ver %s Distrib %s, for %s (%s)\n",my_progname,DUMP_VERSION,
 	 MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
 }
 
+
 static void usage()
 {
   print_version();
@@ -87,6 +91,7 @@ The numeric-dump-file should contain a numeric stack trace from mysqld.\n\
 If the numeric-dump-file is not given, the stack trace is read from stdin.\n");
 }
 
+#include <help_end.h>
 
 
 static void die(const char* fmt, ...)

include/config-netware.h

@@ -45,6 +45,7 @@ extern "C" {
 #undef HAVE_SCHED_H
 #undef HAVE_SYS_MMAN_H
 #undef HAVE_SYNCH_H
+#undef HAVE_MMAP
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 #define HAVE_PTHREAD_SIGMASK 1
 #define HAVE_PTHREAD_YIELD_ZERO_ARG 1

include/help_end.h

@@ -2,5 +2,6 @@
 #undef printf
 #undef puts
 #undef fputs
+#undef fputc
 #undef putchar
 #endif

include/help_start.h

@@ -4,4 +4,6 @@
 #define printf    consoleprintf
 #define puts(s)   consoleprintf("%s\n",s)
 #define fputs(s,f)   puts(s)
+#define fputc(s,f)   consoleprintf("%c", s)
+#define putchar(s)   consoleprintf("%c", s)
 #endif

myisam/myisamlog.c

@@ -247,6 +247,7 @@ static void get_options(register int *argc, register char ***argv)
 	/* Fall through */
       case 'I':
       case '?':
+#include <help_start.h>
 	printf("%s  Ver 1.4 for %s at %s\n",my_progname,SYSTEM_TYPE,
 	       MACHINE_TYPE);
 	puts("By Monty, for your professional use\n");
@@ -268,6 +269,7 @@ static void get_options(register int *argc, register char ***argv)
 	puts("If a recover is done all writes and all possibly updates and deletes is done\nand errors are only counted.");
 	puts("If one gives table names as arguments only these tables will be updated\n");
 	help=1;
+#include <help_end.h>
 	break;
       default:
 	printf("illegal option: \"-%c\"\n",*pos);

netware/BUILD/compile-netware-START

@@ -22,5 +22,7 @@ base_configs=" \
 	--enable-local-infile \
 	--with-extra-charsets=all \
 	--prefix=N:/mysql \
+	--without-mysqlmanager \
+	--without-man \
 	"
 

netware/BUILD/nwbootstrap

@@ -174,13 +174,7 @@ done
 # create the libmysql.imp file in netware folder from libmysql/libmysql.def
 # file
 echo "generating llibmysql.imp file..."
-awk 'BEGIN{x=0;}  x==1 {print $1;next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp
-
-# create the libmysql.imp file in netware folder from libmysql/libmysql.def file
-echo "generating llibmysql.imp file..."
-awk 'BEGIN{x=0;}  x==1 {print $1;next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp
-
-
+awk 'BEGIN{x=0;}  END{printf("\n");} x==1 {printf(" %s",$1); x++; next} x>1 {printf(",\n %s", $1);next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp
 # build linux tools
 echo "compiling linux tools..."
 ./netware/BUILD/compile-linux-tools

netware/my_manage.c

@@ -73,7 +73,7 @@ void init_args(arg_list_t *al)
 	Add an argument to a list.
 
 ******************************************************************************/
-void add_arg(arg_list_t *al, char *format, ...)
+void add_arg(arg_list_t *al, const char *format, ...)
 {
   va_list ap;
   char temp[PATH_MAX];
@@ -439,7 +439,7 @@ void del_tree(char *dir)
 	removef()
 	
 ******************************************************************************/
-int removef(char *format, ...)
+int removef(const char *format, ...)
 {
 	va_list ap;
   char path[PATH_MAX];

scripts/make_binary_distribution.sh

@@ -235,8 +235,10 @@ rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_
 # Copy system dependent files
 #
 if [ $BASE_SYSTEM = "netware" ] ; then
-  cp ./netware/static_init_db.sql ./netware/init_db.sql
-  ./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
+  echo "CREATE DATABASE mysql;" > $BASE/bin/init_db.sql
+  echo "CREATE DATABASE test;" >> $BASE/bin/init_db.sql
+  sh ./scripts/mysql_create_system_tables.sh real >> $BASE/bin/init_db.sql
+  sh ./scripts/mysql_create_system_tables.sh test > $BASE/bin/test_db.sql
 fi
 
 #

sql/mysqld.cc

@@ -147,6 +147,10 @@ int deny_severity = LOG_WARNING;
 #include <sys/mman.h>
 #endif
 
+#define zVOLSTATE_ACTIVE 6
+#define zVOLSTATE_DEACTIVE 2
+#define zVOLSTATE_MAINTENANCE 3
+
 #ifdef __NETWARE__
 #include <nks/vm.h>
 #include <library.h>
@@ -1683,7 +1687,9 @@ ulong neb_event_callback(struct EventBlock *eblock)
   voldata= (EventChangeVolStateEnter_s *)eblock->EBEventData;
 
   /* Deactivation of a volume */
-  if ((voldata->oldState == 6 && voldata->newState == 2))
+  if ((voldata->oldState == zVOLSTATE_ACTIVE &&
+       voldata->newState == zVOLSTATE_DEACTIVE ||
+       voldata->newState == zVOLSTATE_MAINTENANCE))
   {
     /*
       Ensure that we bring down MySQL server only for MySQL data