summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-10-10 12:49:10 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2016-10-10 12:51:44 +0000
commited4a6f12b3db90de2168273871e7153fb458aee6 (patch)
tree2ae363253c8d0ecba9d80426a3ddca8029528542
parentf35e918989080d1810c2e1c7fc91f3130585607b (diff)
downloadmariadb-git-ed4a6f12b3db90de2168273871e7153fb458aee6.tar.gz
MDEV-10823 amend : Use opt_log_basename instead of hostname to test
filesystem case sensitivity. Hostname can include characters, which are invalid for use as filename, thus case sensitivity test will fail to produce meaningful results.
-rw-r--r--sql/mysqld.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 466a54b21a8..2f0fd46845c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -9887,9 +9887,9 @@ static int test_if_case_insensitive(const char *dir_name)
MY_STAT stat_info;
DBUG_ENTER("test_if_case_insensitive");
- fn_format(buff, glob_hostname, dir_name, ".lower-test",
+ fn_format(buff, opt_log_basename, dir_name, ".lower-test",
MY_UNPACK_FILENAME | MY_REPLACE_EXT | MY_REPLACE_DIR);
- fn_format(buff2, glob_hostname, dir_name, ".LOWER-TEST",
+ fn_format(buff2, opt_log_basename, dir_name, ".LOWER-TEST",
MY_UNPACK_FILENAME | MY_REPLACE_EXT | MY_REPLACE_DIR);
mysql_file_delete(key_file_casetest, buff2, MYF(0));
if ((file= mysql_file_create(key_file_casetest,