diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-11-10 14:42:12 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-11-10 14:42:12 +0200 |
| commit | f0db66fb5505da2fa1c0613810da6ccf5a845e46 (patch) | |
| tree | 8c18a1596ace9be9b4b9b62060477237558864f1 /sql/mysqld.cc | |
| parent | 1bbd709725e6afdc08662e0dc546c0d9b45c4aee (diff) | |
| parent | 97c7765f6432d40be14cad62024eaaab953d4da2 (diff) | |
| download | mariadb-git-f0db66fb5505da2fa1c0613810da6ccf5a845e46.tar.gz | |
merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2be95bca54d..a8e99e08092 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8672,14 +8672,8 @@ static int fix_paths(void) pos[0]= FN_LIBCHAR; pos[1]= 0; } - convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS); - my_realpath(mysql_unpacked_real_data_home, mysql_real_data_home, MYF(0)); - mysql_unpacked_real_data_home_len= strlen(mysql_unpacked_real_data_home); - if (mysql_unpacked_real_data_home[mysql_unpacked_real_data_home_len-1] == FN_LIBCHAR) - --mysql_unpacked_real_data_home_len; - - convert_dirname(language,language,NullS); + convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS); (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir (void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home); (void) my_load_path(pidfile_name,pidfile_name,mysql_real_data_home); @@ -8687,6 +8681,12 @@ static int fix_paths(void) get_relative_path(PLUGINDIR), mysql_home); opt_plugin_dir_ptr= opt_plugin_dir; + my_realpath(mysql_unpacked_real_data_home, mysql_real_data_home, MYF(0)); + mysql_unpacked_real_data_home_len= + (int) strlen(mysql_unpacked_real_data_home); + if (mysql_unpacked_real_data_home[mysql_unpacked_real_data_home_len-1] == FN_LIBCHAR) + --mysql_unpacked_real_data_home_len; + char *sharedir=get_relative_path(SHAREDIR); if (test_if_hard_path(sharedir)) strmake(buff,sharedir,sizeof(buff)-1); /* purecov: tested */ |