Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 (80fc43c1) · Commits · Software / OSDI20 Artifacts / mariadb

scripts/make_binary_distribution.sh

+2 −1

Original line number	Diff line number	Diff line
		@@ -331,7 +331,8 @@ if [ x$NDBCLUSTER = x1 ]; then
		$CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
		$CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
		$CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
		$CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include
		test -d $BASE/include/storage \|\| mkdir $BASE/include/storage
		$CP -r $BASE/ndb-stage@pkgincludedir@/storage/ndb $BASE/include/storage/
		$CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. \|\| exit 1
		rm -rf $BASE/ndb-stage
		fi

support-files/mysql.spec.sh

+17 −6

Original line number	Diff line number	Diff line
		@@ -165,16 +165,16 @@ They should be used with caution.

		%{see_base}

		%package bench
		%package test
		Requires: %{name}-client perl-DBI perl
		Summary: MySQL - Benchmarks and test system
		Summary: MySQL - Test suite
		Group: Applications/Databases
		Provides: mysql-bench
		Obsoletes: mysql-bench
		Provides: mysql-test
		Obsoletes: mysql-bench mysql-test
		AutoReqProv: no

		%description bench
		This package contains MySQL benchmark scripts and data.
		%description test
		This package contains the MySQL regression test suite.

		%{see_base}

		@@ -628,6 +628,9 @@ fi
		%attr(755, root, root) %{_bindir}/ndb_config
		%attr(755, root, root) %{_bindir}/ndb_error_reporter
		%attr(755, root, root) %{_bindir}/ndb_size.pl
		%attr(755, root, root) %{_bindir}/ndb_print_backup_file
		%attr(755, root, root) %{_bindir}/ndb_print_schema_file
		%attr(755, root, root) %{_bindir}/ndb_print_sys_file
		%attr(-, root, root) %{_datadir}/mysql/ndb_size.tmpl

		%files ndb-extra
		@@ -635,6 +638,7 @@ fi
		%attr(755, root, root) %{_bindir}/ndb_drop_index
		%attr(755, root, root) %{_bindir}/ndb_drop_table
		%attr(755, root, root) %{_bindir}/ndb_delete_all
		%attr(755, root, root) %{_sbindir}/ndb_cpcd

		%files devel
		%defattr(-, root, root, 0755)
		@@ -667,6 +671,13 @@ fi
		%{_libdir}/libmysql.so
		%{_libdir}/libndb.so

		%files test
		%defattr(-, root, root, 0755)
		%attr(-, root, root) %{_datadir}/mysql-test
		%attr(755, root, root) %{_bindir}/mysql_client_test
		%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
		%attr(755, root, root) %{_bindir}/mysqltest_embedded

		%files embedded
		%defattr(-, root, root, 0755)
		%attr(644, root, root) %{_libdir}/mysql/libmysqld.a