diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-06-04 17:26:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-04 17:26:11 +0200 |
| commit | 3e3606d21deec2a7508d47740ab7a7a7f5b9b698 (patch) | |
| tree | 5e041eb2fc7ca4f15ff97bfc3dba62840ab802fc /cmake | |
| parent | afedd72e225654225b20a91b072b012e4c57a9d4 (diff) | |
| parent | 25ada13db06d06050f0361bc434fe2b58303b5f2 (diff) | |
| download | mariadb-git-3e3606d21deec2a7508d47740ab7a7a7f5b9b698.tar.gz | |
merge with 5.3.
Take only test cases from MDEV-136 Non-blocking "set read_only"
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_layout.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 1210c50d6cf..3ad6da5d433 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -77,9 +77,7 @@ IF(UNIX) IF(INSTALL_LAYOUT MATCHES "RPM") SET(default_prefix "/usr") ELSEIF(INSTALL_LAYOUT MATCHES "DEB") - SET(default_prefix "/opt/mysql/server-${MYSQL_BASE_VERSION}") - # This is required to avoid "cpack -GDEB" default of prefix=/usr - SET(CPACK_SET_DESTDIR ON) + SET(default_prefix "/usr") ELSEIF(INSTALL_LAYOUT MATCHES "SVR4") SET(default_prefix "/opt/mysql/mysql") ELSE() @@ -191,7 +189,7 @@ SET(INSTALL_SUPPORTFILESDIR_DEB "support-files") SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql") SET(INSTALL_PLUGINTESTDIR_DEB ${plugin_tests}) -SET(INSTALL_UNIX_ADDRDIR_DEB "/tmp/mysql.sock") +SET(INSTALL_UNIX_ADDRDIR_DEB "/var/run/mysqld/mysqld.sock") # # SVR4 layout # |