From c6d317831ab8ccbef3685a5f03ca8c2cfa4d92f0 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 11 Nov 2006 14:12:30 +0100 Subject: [PATCH 1/6] mysql-test-run.pl: Test for base directory when a RPM install corrected mysql-test/mysql-test-run.pl: Test for base directory when a RPM install corrected --- mysql-test/mysql-test-run.pl | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 36006d1f156..ce9fd4344ea 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -467,7 +467,7 @@ sub initial_setup () { $glob_hostname= mtr_short_hostname(); - # 'basedir' is always above "mysql-test" directory ... + # Find the absolute path to the test directory $glob_mysql_test_dir= cwd(); if ( $glob_cygwin_perl ) { @@ -475,12 +475,20 @@ sub initial_setup () { $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`; chomp($glob_mysql_test_dir); } - # ... direct parent for "tar.gz" installations, ... - $glob_basedir= dirname($glob_mysql_test_dir); - # ... or one more level up, for RPM installations. - if ( ! -d "$glob_basedir/bin" ) + + # In most cases, the base directory we find everything relative to, + # is the parent directory of the "mysql-test" directory. For source + # distributions, TAR binary distributions and some other packages. + $glob_basedir= dirname($glob_mysql_test_dir); + + # In the RPM case, binaries and libraries are installed in the + # default system locations, instead of having our own private base + # directory. And we install "/usr/share/mysql-test". Moving up one + # more directory relative to "mysql-test" gives us a usable base + # directory for RPM installs. + if ( ! $opt_source_dist and ! -d "$glob_basedir/bin" ) { - $glob_basedir= dirname($glob_basedir); + $glob_basedir= dirname($glob_basedir); } # Expect mysql-bench to be located adjacent to the source tree, by default From b09ae0ab10f4efd3c614d5cbe6cbb8413ca9d24b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Nov 2006 11:10:27 +0100 Subject: [PATCH 2/6] Build the generic RPMs including the "partition" feature. bug#23949 support-files/mysql.spec.sh: Add the "partition" feature to the server configuration, whether debugging or not. (bug#23949) --- support-files/mysql.spec.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 60548210b7d..6c860f273d4 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -318,6 +318,7 @@ BuildMySQL "--enable-shared \ --with-example-storage-engine \ --with-blackhole-storage-engine \ --with-federated-storage-engine \ + --with-partition \ --with-big-tables \ --with-comment=\"MySQL Community Server - Debug (GPL)\"") @@ -348,6 +349,7 @@ BuildMySQL "--enable-shared \ --with-example-storage-engine \ --with-blackhole-storage-engine \ --with-federated-storage-engine \ + --with-partition \ --with-embedded-server \ --with-big-tables \ --with-comment=\"MySQL Community Server (GPL)\"") From f2f94041143ca682774cdf49752c489d5f207f02 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Nov 2006 12:10:12 +0100 Subject: [PATCH 3/6] support-files/mysql.spec.sh : Make the server report its features in the first test run. support-files/mysql.spec.sh: 1) Ensure that the features of each server built are reported in the first test run it takes. 2) Add "--with-partition" to the change log (missing on previous push). --- support-files/mysql.spec.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 6c860f273d4..d808ade8342 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -329,7 +329,7 @@ then fi (cd mysql-debug-%{mysql_version}/mysql-test ; \ - ./mysql-test-run.pl --comment=debug --skip-rpl --skip-ndbcluster --force ; \ + ./mysql-test-run.pl --comment=debug --skip-rpl --skip-ndbcluster --force --report-features ; \ true) ############################################################################## @@ -360,7 +360,7 @@ then fi cd mysql-release-%{mysql_version}/mysql-test -./mysql-test-run.pl --comment=normal --force --skip-ndbcluster --timer || true +./mysql-test-run.pl --comment=normal --force --skip-ndbcluster --timer --report-features || true ./mysql-test-run.pl --comment=ps --ps-protocol --force --skip-ndbcluster --timer || true ./mysql-test-run.pl --comment=normal+rowrepl --mysqld=--binlog-format=row --force --skip-ndbcluster --timer || true ./mysql-test-run.pl --comment=ps+rowrepl+NDB --ps-protocol --mysqld=--binlog-format=row --force --timer || true @@ -687,6 +687,12 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Mon Nov 13 2006 Joerg Bruehe + +- Add "--with-partition" to all server builds. + +- Use "--report-features" in one test run per server build. + * Tue Aug 15 2006 Joerg Bruehe - The "max" server is removed from packages, effective from 5.1.12-beta. From 8da5141d93ac24fe3f03581a5290a8e073b7956e Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Nov 2006 14:50:38 +0100 Subject: [PATCH 4/6] configure.in: Raise version number after cloning 5.1.13 configure.in: Raise version number after cloning 5.1.13 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index a58f71e22c2..004a901b4d4 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.1.13-beta) +AM_INIT_AUTOMAKE(mysql, 5.1.14-beta) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 From b295756927dcf25af37cf2cf177b0c48822675ce Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Nov 2006 14:29:05 +0100 Subject: [PATCH 5/6] make dist now copies .test files in mysql-test/include mysql-test/Makefile.am: add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist --- mysql-test/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 1e6eb12f7b2..9fb66fecfa8 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -55,6 +55,7 @@ dist-hook: -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t $(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include + $(INSTALL_DATA) $(srcdir)/include/*.test $(distdir)/include $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data @@ -82,6 +83,7 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include + $(INSTALL_DATA) $(srcdir)/include/*.test $(DESTDIR)$(testdir)/include $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data From 3bf9b43182b6d747e0c3c33d135742508b07a246 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Nov 2006 14:44:20 +0100 Subject: [PATCH 6/6] make_binary_distribution should of course also copy .test files from mysql-test/include --- scripts/make_binary_distribution.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index f37e667dd86..6359eb009ce 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -224,6 +224,7 @@ $CP mysql-test/lib/*.pl $BASE/mysql-test/lib $CP mysql-test/lib/*.sql $BASE/mysql-test/lib $CP mysql-test/t/*.def $BASE/mysql-test/t $CP mysql-test/include/*.inc $BASE/mysql-test/include +$CP mysql-test/include/*.test $BASE/mysql-test/include $CP mysql-test/std_data/*.dat mysql-test/std_data/*.*001 \ mysql-test/std_data/*.cnf \ $BASE/mysql-test/std_data