diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2011-08-19 19:26:27 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2011-08-19 19:26:27 +0200 |
| commit | 88609db5d85276317b1787ecede9e37f910d63ba (patch) | |
| tree | 398286000ff435d0cecdd045b5981c138f162d92 /support-files | |
| parent | 28c784aa177dd04980d537ac1720232b38c320de (diff) | |
| parent | b2648c9036058ae323ca032f3b09a91270405b6e (diff) | |
| download | mariadb-git-88609db5d85276317b1787ecede9e37f910d63ba.tar.gz | |
Null-upmerge the bug#37165 fix: No functional change,
but some notation improvement is applicable.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 92f055e269a..d492e8fc6b7 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -421,7 +421,7 @@ mkdir debug # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ -DCMAKE_BUILD_TYPE=Debug \ - -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \ + -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ -DFEATURE_SET="%{feature_set}" \ -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \ -DMYSQL_SERVER_SUFFIX="%{server_suffix}" @@ -436,7 +436,7 @@ mkdir release # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \ + -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ -DFEATURE_SET="%{feature_set}" \ -DCOMPILATION_COMMENT="%{compilation_comment_release}" \ -DMYSQL_SERVER_SUFFIX="%{server_suffix}" @@ -1133,6 +1133,11 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog +* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com> + +- Null-upmerge the fix of bug#37165: This spec file is not affected. +- Replace "/var/lib/mysql" by the spec file variable "%{mysqldatadir}". + * Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com> - Added the mysql_plugin client - enables or disables plugins. |