List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:July 16 2012 6:12pm
Subject:bzr push into mysql-trunk branch (joerg.bruehe:4061 to 4062)
View as plain text  
 4062 Joerg Bruehe	2012-07-16 [merge]
      Upmerge from 5.6 (new man page "mysql_config_editor" in the spec file).

    modified:
      support-files/mysql.spec.sh
 4061 Alexander Nozdrin	2012-07-16 [merge]
      Auto-merge from 5.6.

    modified:
      sql/sp_instr.cc
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-06-08 14:32:09 +0000
+++ b/support-files/mysql.spec.sh	2012-07-16 18:10:27 +0000
@@ -1063,6 +1063,7 @@ echo "====="                            
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_config_editor.1*
 
 # ----------------------------------------------------------------------------
 %files -n MySQL-devel%{product_suffix} -f optional-files-devel
@@ -1116,6 +1117,10 @@ echo "====="                            
 # merging BK trees)
 ##############################################################################
 %changelog
+* Mon Jul 16 2012 Joerg Bruehe <joerg.bruehe@stripped>
+
+- Add the man page for the "mysql_config_editor".
+
 * Wed Feb 29 2012 Brajmohan Saxena <brajmohan.saxena@stripped>
 
 - Removal all traces of the readline library from mysql (BUG 13738013)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (joerg.bruehe:4061 to 4062) Joerg Bruehe16 Jul