diff options
author | Joerg Bruehe <joerg@mysql.com> | 2011-02-14 15:53:51 +0100 |
---|---|---|
committer | Joerg Bruehe <joerg@mysql.com> | 2011-02-14 15:53:51 +0100 |
commit | a7662cf0a90ee4826b52209aa880f7e710ca95f9 (patch) | |
tree | 9429bdc22ed110e0c235855d808aff021b5b7e86 /support-files | |
parent | 3058b8e2a6fb49715e1116cedd0394c87fc2dfee (diff) | |
parent | bb956c1ea268e2f540ee5978678e86acb25e6d02 (diff) | |
download | mariadb-git-a7662cf0a90ee4826b52209aa880f7e710ca95f9.tar.gz |
Merge bug fix 42969 into main 5.5 branch.
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/mysql.spec.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 1ee9a234f8b..7e9e8faae46 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -947,6 +947,8 @@ echo "=====" >> $STATUS_HISTORY %doc %{license_files_server} %endif %doc %{src_dir}/Docs/ChangeLog +%doc %{src_dir}/Docs/INFO_SRC* +%doc release/Docs/INFO_BIN* %doc release/support-files/my-*.cnf %doc %attr(644, root, root) %{_infodir}/mysql.info* @@ -1124,13 +1126,16 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog - * Thu Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com> - Fix bug#56581: If an installation deviates from the default file locations ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade) should still work, and use these locations. The problem was that the fix for bug#27072 did not check for local settings. + +* Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com> + +- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN". * Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@oracle.com> |