Commit fd0a4f22 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M50/push-5.0 

into  trift2.:/MySQL/M51/push-5.1


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents 8a2b3baa 134b83d0

support-files/mysql.spec.sh

+5 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ fi 
%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*

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

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

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

%doc %attr(644, root, man) %{_mandir}/man8/mysqlmanager.8*

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

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

%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
@@ -689,6 +689,10 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>



- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.



* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>



- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"