Commit 61587c18 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M51/mysql-5.1 

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


sql/mysqld.cc:
  Auto merged
parents 680ae98b 437126a5

support-files/mysql.spec.sh

+1 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ fi 
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*

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

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

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

%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*