From 9c5fb81fc0712c5a2e26197e5cfc84a7694394e1 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Nov 2003 13:22:49 +0100 Subject: [PATCH 1/5] - removed dependency on MySQL-client from the MySQL-devel RPM subpackage as it is not really required. (BUG 1610) Thanks to Scott Harrison for the suggestion. support-files/mysql.spec.sh: - removed dependency on MySQL-client from the MySQL-devel subpackage as it is not really required. (BUG 1610) --- support-files/mysql.spec.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index ffc74c7559d..974a3bde36a 100644 --- a/support-files/mysql.spec.sh +++ b/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ções de desempenho @@ -568,6 +567,11 @@ fi # The spec file changelog only includes changes made to the spec file # itself %changelog +* Fri Nov 21 2003 Lenz Grimmer + +- removed dependency on MySQL-client from the MySQL-devel subpackage + as it is not really required. (BUG 1610) + * Fri Aug 29 2003 Lenz Grimmer - Fixed BUG 1162 (removed macro names from the changelog) From c61d96d5baf8bb1d11502552a24cfca743e41419 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 23 Nov 2003 21:03:10 +0200 Subject: [PATCH 2/5] Fix test for binary builds mysql-test/r/rpl_change_master.result: Updated results --- mysql-test/r/rpl_change_master.result | 6 +++--- mysql-test/t/rpl_change_master.test | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result index be2aec616b0..966f07af9d5 100644 --- a/mysql-test/r/rpl_change_master.result +++ b/mysql-test/r/rpl_change_master.result @@ -8,7 +8,7 @@ select get_lock("a",5); get_lock("a",5) 1 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); stop slave; select * from t1; @@ -16,11 +16,11 @@ n 1 show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space -127.0.0.1 root 9306 1 master-bin.001 273 slave-relay-bin.002 255 master-bin.001 No No 0 0 214 314 +127.0.0.1 root MASTER_MYPORT 1 master-bin.001 273 slave-relay-bin.002 255 master-bin.001 No No 0 0 214 314 change master to master_user='root'; show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space -127.0.0.1 root 9306 1 master-bin.001 214 slave-relay-bin.001 4 master-bin.001 No No 0 0 214 4 +127.0.0.1 root MASTER_MYPORT 1 master-bin.001 214 slave-relay-bin.001 4 master-bin.001 No No 0 0 214 4 select release_lock("a"); release_lock("a") 1 diff --git a/mysql-test/t/rpl_change_master.test b/mysql-test/t/rpl_change_master.test index 61de22fe57b..a13e045cf48 100644 --- a/mysql-test/t/rpl_change_master.test +++ b/mysql-test/t/rpl_change_master.test @@ -4,15 +4,17 @@ 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 show slave status; change master to master_user='root'; +--replace_result $MASTER_MYPORT MASTER_MYPORT show slave status; # Will restart from after the values(2), which is bug select release_lock("a"); From 5281f34e6471af78526860442a2e38a07845e27f Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 24 Nov 2003 13:25:08 +0200 Subject: [PATCH 3/5] Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG did not call get_one_option(). --- mysys/my_getopt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 5644d81837d..662e33a3a5a 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -316,8 +316,6 @@ int handle_options(int *argc, char ***argv, else /* If argument differs from 0, enable option, else disable */ *((my_bool*) optp->value)= (my_bool) atoi(optend) != 0; } - (*argc)--; - continue; } else if (optp->arg_type == REQUIRED_ARG && !optend) { From 534ea9689face130dc8f64c2ed600b5956990333 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 24 Nov 2003 17:05:24 +0100 Subject: [PATCH 4/5] - Rephrased two option help texts to not start with "use the ..." as this confuses RPM's Perl module dependency checking (it adds a bogus requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931) scripts/mysqlaccess.sh: - Rephrased option help text so it does not start with "use" as this confuses RPM's Perl module dependency checking (it adds a bogus requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931) sql-bench/bench-init.pl.sh: - Rephrased option help text so it does not start with "use" as this confuses RPM's Perl module dependency checking (it adds a bogus requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931) --- scripts/mysqlaccess.sh | 2 +- sql-bench/bench-init.pl.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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. diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh index 1ac5f29723b..d61551ffb3b 100644 --- a/sql-bench/bench-init.pl.sh +++ b/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. From ea280fd3ff1ab19370fba66e7f001351f8a23413 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Nov 2003 17:52:12 +0100 Subject: [PATCH 5/5] - Removed COPYING.LIB from all source and binary distributions after it was removed from manual.texi (where it was automatically generated from). Docs/Makefile.am: - don't create COPYING.LIB anymore (was removed from manual.texi) Makefile.am: - Removed COPYING.LIB from the source distribution scripts/make_binary_distribution.sh: - Removed COPYING.LIB from the binary distribution scripts/make_win_src_distribution.sh: - Removed COPYING.LIB from the windows source distribution support-files/mysql.spec.sh: - Removed COPYING.LIB from the Server RPM --- Docs/Makefile.am | 3 --- Makefile.am | 3 +-- scripts/make_binary_distribution.sh | 2 +- scripts/make_win_src_distribution.sh | 2 +- support-files/mysql.spec.sh | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 07dac2d9df1..bf7aaa747e3 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -204,9 +204,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" > $@ diff --git a/Makefile.am b/Makefile.am index b9e0e88ff77..8aef19d0920 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory -EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB +EXTRA_DIST = INSTALL-SOURCE README COPYING SUBDIRS = . include @docs_dirs@ @readline_dir@ \ @thread_dirs@ pstack @sql_client_dirs@ \ @sql_server_dirs@ scripts man tests \ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 8735fc800ce..300fc4a7020 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 c521c4cfdcb..3556b00cbc7 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/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 974a3bde36a..658b90d1a3f 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -444,7 +444,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