Commit ee351622 authored by unknown's avatar unknown
Browse files

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

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


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Null-merge: 5.0 version number upgrade only, irrelevant for 5.1
parents e0ef6303 76e2b3e5

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*