Merge bug fix development tree (37098: "unpackaged files") (eb3681ef) · Commits · Software / OSDI20 Artifacts / mariadb

configure.in

+3 −0

Original line number	Diff line number	Diff line
		@@ -2722,6 +2722,9 @@ then
		sql_server="vio sql"
		fi

		# "innochecksum" is not in the "innobase/" subdirectory, but should be switched
		AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innobase" = Xyes])

		# IMPORTANT - do not modify LIBS past this line - this hack is the only way
		# I know to add the static NSS magic if we have static NSS libraries with
		# glibc - Sasha

extra/Makefile.am

+6 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,12 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
		$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h

		bin_PROGRAMS = replace perror resolveip my_print_defaults \
		resolve_stack_dump mysql_waitpid innochecksum
		resolve_stack_dump mysql_waitpid
		# "innochecksum" should be switched
		if BUILD_INNODB_TOOLS
		bin_PROGRAMS += innochecksum
		endif

		noinst_PROGRAMS = charset2html
		EXTRA_PROGRAMS = comp_err
		EXTRA_DIST = CMakeLists.txt

man/Makefile.am

+4 −0

Original line number	Diff line number	Diff line
		@@ -21,5 +21,9 @@ man1_MANS = @man1_files@
		man8_MANS = @man8_files@
		EXTRA_DIST = $(man1_MANS) $(man8_MANS)

		# "make_win_*" are not needed in Unix binary packages,
		install-data-hook:
		rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*

		# Don't update the files from bitkeeper
		%::SCCS/s.%

scripts/make_binary_distribution.sh

+4 −0

Original line number	Diff line number	Diff line
		@@ -385,6 +385,9 @@ copyfileto $BASE/include config.h include/*

		rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h

		# In a NetWare binary package, these tools and their manuals are not useful
		rm -f $BASE/man/man1/make_win_*

		copyfileto $BASE/support-files support-files/*

		copyfileto $BASE/share scripts/*.sql
		@@ -427,6 +430,7 @@ fi

		rm -f $BASE/bin/Makefile* $BASE/bin/.in $BASE/bin/.sh \
		$BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \
		$BASE/bin/make_win_* \
		$BASE/bin/setsomevars $BASE/support-files/Makefile* \
		$BASE/support-files/*.sh

support-files/mysql.spec.sh

+27 −1

Original line number	Diff line number	Diff line
		@@ -445,6 +445,9 @@ install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
		# Install embedded server library in the build root
		install -m 644 $MBD/libmysqld/libmysqld.a $RBR%{_libdir}/mysql/

		# in RPMs, it is unlikely that anybody should use "sql-bench"
		rm -fr $RBR%{_datadir}/sql-bench

		# Create a symlink "rcmysql", pointing to the init.script. SuSE users
		# will appreciate that, as all services usually offer this.
		ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql
		@@ -636,6 +639,7 @@ fi

		%doc %attr(644, root, root) %{_infodir}/mysql.info*

		%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
		%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
		%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1*
		%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
		@@ -654,12 +658,14 @@ fi
		%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
		%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
		%doc %attr(644, root, man) %{_mandir}/man1/replace.1*

		%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
		%ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd

		%attr(755, root, root) %{_bindir}/innochecksum
		%attr(755, root, root) %{_bindir}/my_print_defaults
		%attr(755, root, root) %{_bindir}/myisam_ftdump
		%attr(755, root, root) %{_bindir}/myisamchk
		@@ -700,6 +706,7 @@ fi
		%attr(755, root, root) %{_bindir}/msql2mysql
		%attr(755, root, root) %{_bindir}/mysql
		%attr(755, root, root) %{_bindir}/mysql_find_rows
		%attr(755, root, root) %{_bindir}/mysql_upgrade_shell
		%attr(755, root, root) %{_bindir}/mysql_waitpid
		%attr(755, root, root) %{_bindir}/mysqlaccess
		%attr(755, root, root) %{_bindir}/mysqladmin
		@@ -712,6 +719,7 @@ fi

		%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
		@@ -757,6 +765,8 @@ fi
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_mgm.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_restore.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_backup_file.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_schema_file.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_sys_file.1*
		@@ -768,13 +778,14 @@ fi

		%files ndb-extra
		%defattr(-,root,root,0755)
		%attr(755, root, root) %{_sbindir}/ndb_cpcd
		%attr(755, root, root) %{_bindir}/ndb_delete_all
		%attr(755, root, root) %{_bindir}/ndb_drop_index
		%attr(755, root, root) %{_bindir}/ndb_drop_table
		%attr(755, root, root) %{_sbindir}/ndb_cpcd
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1*
		%doc %attr(644, root, man) %{_mandir}/man1/ndb_cpcd.1*
		%endif

		%files devel
		@@ -785,6 +796,7 @@ fi
		%dir %attr(755, root, root) %{_includedir}/mysql
		%dir %attr(755, root, root) %{_libdir}/mysql
		%{_includedir}/mysql/*
		%{_datadir}/aclocal/mysql.m4
		%{_libdir}/mysql/libdbug.a
		%{_libdir}/mysql/libheap.a
		%if %{have_libgcc}
		@@ -834,6 +846,20 @@ fi
		# itself - note that they must be ordered by date (important when
		# merging BK trees)
		%changelog
		* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>

		- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
		Some generated files aren't needed in RPMs:
		- the "sql-bench/" subdirectory
		Some files were missing:
		- /usr/share/aclocal/mysql.m4 ("devel" subpackage)
		- Manual "mysqlbug" ("server" subpackage)
		- Program "innochecksum" and its manual ("server" subpackage)
		- Manual "mysql_find_rows" ("client" subpackage)
		- Script "mysql_upgrade_shell" ("client" subpackage)
		- Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
		- Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)

		* Mon Mar 31 2008 Kent Boortz <kent@mysql.com>

		- Made the "Federated" storage engine an option