merged

Docs/Makefile.am:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/rpl_change_master.result:
  merged - ul

3 files changed, 3 insertions, 3 deletions

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 9d166fc1baa..02caabcab78 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -85,7 +85,7 @@ do
   fi
 done
 
-for i in COPYING COPYING.LIB README Docs/INSTALL-BINARY \
+for i in COPYING README Docs/INSTALL-BINARY \
          MySQLEULA.txt LICENSE.doc README.NW 
 do
   if [ -f $i ]
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index e164f8c15dd..d83548d0061 100755
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -282,7 +282,7 @@ touch $BASE/innobase/ib_config.h
 #
 
 cd $SOURCE
-for i in COPYING COPYING.LIB ChangeLog README \
+for i in COPYING ChangeLog README \
          INSTALL-SOURCE INSTALL-WIN \
          INSTALL-WIN-SOURCE \
          Docs/manual_toc.html  Docs/manual.html \
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index 699e74834e3..75ef63ecdd0 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -286,7 +286,7 @@ Release Notes:
     * --old_server: mysqlaccess will now use a full where clause when
                     retrieving information from the MySQL-server.  If
                     you are connecting to an old server (before v3.21)
-                    use the option --old_server.
+                    then use the option --old_server.
   2.03         : (1998-02-27)
   - bugfix:
     * in Host::MatchTemplate: incorrect match if host-field was left empty.