diff options
| author | monty@mashka.mysql.fi <> | 2002-11-12 23:31:15 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-11-12 23:31:15 +0200 |
| commit | 12c11c34b8b549913f1882fb9a46dbbacd88e9af (patch) | |
| tree | 13207b23f05f9d23e6072dc4e55b3eb6d17876aa | |
| parent | 47c7adea12f4d1baf5ae0999c692940ebecc73bc (diff) | |
| parent | 07b4140c8508f0d75bd975b5576298c5cb4c1522 (diff) | |
| download | mariadb-git-12c11c34b8b549913f1882fb9a46dbbacd88e9af.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
| -rw-r--r-- | sql/mysqld.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 62f8ed62877..f2a536ada9b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4472,9 +4472,17 @@ fn_format_relative_to_data_home(my_string to, const char *name, static void fix_paths(void) { - char buff[FN_REFLEN]; + char buff[FN_REFLEN],*pos; convert_dirname(mysql_home,mysql_home,NullS); + /* Resolve symlinks to allow 'mysql_home' to be a relative symlink */ my_realpath(mysql_home,mysql_home,MYF(0)); + /* Ensure that mysql_home ends in FN_LIBCHAR */ + pos=strend(mysql_home); + if (pos[-1] != FN_LIBCHAR) + { + pos[0]= FN_LIBCHAR; + pos[1]= 0; + } convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS); convert_dirname(language,language,NullS); (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir |