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

into  mysql.com:/usr/home/bar/mysql-5.0.char1

netware/mysql_test_run.c

@@ -173,7 +173,7 @@ void report_stats()
     log_msg("\nFailed %u/%u test(s), %.02f%% successful.\n",
       total_fail, total_test, percent);
 		log_msg("\nThe .out and .err files in %s may give you some\n", result_dir);
-		log_msg("hint of what when wrong.\n");
+		log_msg("hint of what went wrong.\n");
 		log_msg("\nIf you want to report this error, please first read the documentation\n");
 		log_msg("at: http://www.mysql.com/doc/en/MySQL_test_suite.html\n");
   }

netware/pack_isam.def

@@ -2,6 +2,7 @@
 # Pack ISAM
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
+SCREENNAME "MySQL ISAM Table Pack Tool"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL ISAM Table Pack Tool"
 SCREENNAME "MySQL ISAM Table Pack Tool"

scripts/make_binary_distribution.sh

@@ -275,8 +275,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
       >> $BASE/bin/init_db.sql
   sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 \
       > $BASE/bin/test_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
+  ./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
 fi
 
 #