diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-05 14:24:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-05 14:24:38 +0200 |
| commit | 3012a5d5ce37f3fee35d24750938f69586d38e13 (patch) | |
| tree | 23d810eee7197716a39185ce996aae1e77c7a5da /sql/sys_vars.cc | |
| parent | 9ced8f2a17fd315891190291a2e307e226ed9d6a (diff) | |
| download | mariadb-git-3012a5d5ce37f3fee35d24750938f69586d38e13.tar.gz | |
MDEV-3796 various RPM problems
cmake/cpack_rpm.cmake:
* mark all cnf files with %config(noreplace)
* add the forgotten postun script
sql/sys_vars.cc:
0 for a string variable means "no default. But datadir has the default value.
support-files/rpm/server-postin.sh:
* use mysqld --help to determine the correct datadir in the presence of my.cnf files
(better than my_print_defaults, because it considers the correct group set).
* Only create users, and chown/chmod if it's a fresh install, not an upgrade.
* only run mysql_install_db if datadir does not exist
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 6de285086a2..f9e43712f31 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -568,7 +568,7 @@ static Sys_var_ulong Sys_connect_timeout( static Sys_var_charptr Sys_datadir( "datadir", "Path to the database root directory", READ_ONLY GLOBAL_VAR(mysql_real_data_home_ptr), - CMD_LINE(REQUIRED_ARG, 'h'), IN_FS_CHARSET, DEFAULT(0)); + CMD_LINE(REQUIRED_ARG, 'h'), IN_FS_CHARSET, DEFAULT(mysql_real_data_home)); #ifndef DBUG_OFF static Sys_var_dbug Sys_dbug( |