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

Docs/Makefile.am

@@ -203,9 +203,6 @@ INSTALL-BINARY:	mysql.info $(GT)
 ../COPYING:		mysql.info $(GT)
 	perl -w $(GT) mysql.info "GPL license" "LGPL license" > $@
 
-../COPYING.LIB:		mysql.info $(GT)
-	perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@
-
 ../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)
 	perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@
 

Makefile.am

@@ -19,9 +19,8 @@
 AUTOMAKE_OPTIONS =	foreign
 
 # These are built from source in the Docs directory
-EXTRA_DIST =		INSTALL-SOURCE README \
-			COPYING COPYING.LIB zlib
-SUBDIRS =		. include @docs_dirs@ \
+EXTRA_DIST =		INSTALL-SOURCE README COPYING zlib
+SUBDIRS =		. include @docs_dirs@ \ 
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack @sql_client_dirs@ \
 			@sql_server_dirs@ scripts man tests \

mysql-test/t/rpl_change_master.test

@@ -4,11 +4,11 @@ connection slave;
 select get_lock("a",5);
 connection master;
 create table t1(n int);
-insert into t1 values(1+get_lock("a",10)*0);
+insert into t1 values(1+get_lock("a",15)*0);
 insert into t1 values(2);
 save_master_pos;
 connection slave;
-sleep 3; # can't sync_with_master as we should be blocked
+--real_sleep 3; # can't sync_with_master as we should be blocked
 stop slave;
 select * from t1;
 --replace_result $MASTER_MYPORT MASTER_MYPORT

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 ]

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 \

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.

sql-bench/bench-init.pl.sh

@@ -509,7 +509,7 @@ All benchmarks takes the following options:
 
 --socket='socket'
   If the database supports connecting through a Unix socket,
-  use this socket to connect
+  then use this socket to connect
 
 --regions
   This is a test specific option that is only used when debugging a test.

support-files/mysql.spec.sh

@@ -120,7 +120,6 @@ Este pacote cont
 
 %package devel
 Release: %{release}
-Requires: %{name}-client
 Summary: MySQL - Development header files and libraries
 Group: Applications/Databases
 Summary(pt_BR): MySQL - Medi<64><69>es de desempenho
@@ -446,7 +445,7 @@ fi
 %files server
 %defattr(755 root, root)
 
-%doc %attr(644, root, root) COPYING COPYING.LIB README
+%doc %attr(644, root, root) COPYING README
 %doc %attr(644, root, root) Docs/manual.{html,ps,texi,txt} Docs/manual_toc.html
 %doc %attr(644, root, root) support-files/my-*.cnf
 
@@ -569,6 +568,11 @@ fi
 # The spec file changelog only includes changes made to the spec file
 # itself
 %changelog 
+* Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed dependency on MySQL-client from the MySQL-devel subpackage
+  as it is not really required. (BUG 1610)
+
 * Fri Aug 29 2003 Lenz Grimmer <lenz@mysql.com>
 
 - Fixed BUG 1162 (removed macro names from the changelog)