bk commit into 5.0 tree (jani:1.2050)

[jani]

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.2050 05/10/14 08:45:41 jani@stripped +3 -0
  Small fixes for Netware.

  scripts/make_binary_distribution.sh
    1.99 05/10/14 08:45:33 jani@stripped +1 -2
    Fixed mistake in merge.

  netware/pack_isam.def
    1.7 05/10/14 08:45:32 jani@stripped +1 -0
    Added screenname.

  netware/mysql_test_run.c
    1.15 05/10/14 08:45:32 jani@stripped +1 -1
    Fixed typo.

# 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

--- 1.98/scripts/make_binary_distribution.sh	2005-10-13 18:23:47 +03:00
+++ 1.99/scripts/make_binary_distribution.sh	2005-10-14 08:45:33 +03:00
@@ -275,8 +275,7 @@
       >> $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
 
 #

--- 1.14/netware/mysql_test_run.c	2005-08-28 11:38:09 +03:00
+++ 1.15/netware/mysql_test_run.c	2005-10-14 08:45:32 +03:00
@@ -173,7 +173,7 @@
     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");
   }

--- 1.6/netware/pack_isam.def	2005-10-13 17:36:41 +03:00
+++ 1.7/netware/pack_isam.def	2005-10-14 08:45:32 +03:00
@@ -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"