Commit 4cff4db3 authored by Joerg Bruehe's avatar Joerg Bruehe
Browse files

Merge the bug fix development (37098: "unpackaged files") 

into the 5.0 team tree.
parents 393df2a0 ff3d230a

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -2810,6 +2810,9 @@ EOF 
    AC_CONFIG_SUBDIRS(innobase)

  fi



  # "innochecksum" is not in the "innobase/" subdirectory, but should be switched

  AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$have_innodb" = Xyes])



case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in

  *solaris*-i?86-no-yes)

  if $CC -xildon 2>&1 | grep "illegal option" >/dev/null

extra/Makefile.am

+6 −1
Original line number Diff line number Diff line
@@ -45,7 +45,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 comp_err 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_DIST =	CMakeLists.txt

man/Makefile.am

+6 −0
Original line number Diff line number Diff line
@@ -21,5 +21,11 @@ man1_MANS = @man1_files@ 
man8_MANS =   @man8_files@

EXTRA_DIST =  $(man1_MANS) $(man8_MANS)



# 1) not needed in Unix binary packages,

# 2) programs not generated in 5.0:

install-data-hook:

	rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*

	rm -f $(DESTDIR)$(manlibdir)/man1/ndb_print_*



# Don't update the files from bitkeeper

%::SCCS/s.%

scripts/make_binary_distribution.sh

+3 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ if [ $BASE_SYSTEM != "netware" ] ; then 
  if [ -d man ] ; then

    $CP man/*.1 $BASE/man/man1

    $CP man/*.8 $BASE/man/man8

    # In a Unix binary package, these tools and their manuals are not useful

    rm -f $BASE/man/man1/make_win_*

  fi

fi
@@ -331,6 +333,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

+23 −0
Original line number Diff line number Diff line
@@ -591,6 +591,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*
@@ -610,6 +611,7 @@ 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*

%doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1*
@@ -617,6 +619,7 @@ fi 
%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
@@ -661,6 +664,7 @@ fi 
%attr(755, root, root) %{_bindir}/mysql

%attr(755, root, root) %{_bindir}/mysql_find_rows

%attr(755, root, root) %{_bindir}/mysql_tableinfo

%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
@@ -672,6 +676,8 @@ 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/mysql_tableinfo.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*
@@ -713,6 +719,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_select_all.1*

%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_count.1*

%doc %attr(644, root, man) %{_mandir}/man1/ndb_show_tables.1*
@@ -724,13 +732,16 @@ fi 
%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*



%files devel

%defattr(-, root, root, 0755)

%doc EXCEPTIONS-CLIENT

%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*

%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*

%attr(755, root, root) %{_bindir}/comp_err

%attr(755, root, root) %{_bindir}/mysql_config
@@ -784,6 +795,18 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog

* Mon Aug 18 2008 Joerg Bruehe <joerg@mysql.com>



- Get rid of the "warning: Installed (but unpackaged) file(s) found:"

  Some files were missing:

  - Manual "mysqlbug" ("server" subpackage)

  - Program "innochecksum" and its manual ("server" subpackage)

  - Manuals "mysql_find_rows" + "mysql_tableinfo" ("client" subpackage)

  - Script "mysql_upgrade_shell" ("client" subpackage)

  - Manual "comp_err" ("devel" subpackage)

  - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)

  - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)



* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>



- Add the man pages for "ndbd" and "ndb_mgmd".