Default datadir should not be changed for existing GA

ltangvald · bjornmu · commit cd71633b4631 · 2016-10-13T09:36:28.000+02:00
The DATADIR_DEB setting isn't directly used by most server installations, as the packages provide
their own config files, but it's used by cluster, which has GA released based on 5.6, so the value
should not be changed here.

(cherry picked from commit f1a56982f8d90990894983ced755112ab6cdb6d9)
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
@@ -409,7 +409,7 @@ SET(INSTALL_MYSQLTESTDIR_DEB            "mysql-test")
 SET(INSTALL_SQLBENCHDIR_DEB             ".")
 SET(INSTALL_SUPPORTFILESDIR_DEB         "support-files")
 #
-SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
+SET(INSTALL_MYSQLDATADIR_DEB            "data")
 SET(INSTALL_PLUGINTESTDIR_DEB           ${plugin_tests})
 SET(INSTALL_SECURE_FILE_PRIVDIR_DEB     ${secure_file_priv_path})
 SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_DEB     ${secure_file_priv_embedded_path})

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ SET(INSTALL_MYSQLTESTDIR_DEB "mysql-test")`
`409`	`409`	`SET(INSTALL_SQLBENCHDIR_DEB ".")`
`410`	`410`	`SET(INSTALL_SUPPORTFILESDIR_DEB "support-files")`
`411`	`411`	`#`
`412`		`-SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql")`
	`412`	`+SET(INSTALL_MYSQLDATADIR_DEB "data")`
`413`	`413`	`SET(INSTALL_PLUGINTESTDIR_DEB ${plugin_tests})`
`414`	`414`	`SET(INSTALL_SECURE_FILE_PRIVDIR_DEB ${secure_file_priv_path})`
`415`	`415`	`SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_DEB ${secure_file_priv_embedded_path})`