diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-17 21:12:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-17 21:12:14 +0300 |
| commit | 55a46310bb97b749ef556e2f5b5009e0902cfaae (patch) | |
| tree | 63568f06eb26f03c121af33c4fcc99faf61b0026 /sql/mysqld.cc | |
| parent | e101e8d9e3fc6d2e431c101874864673f5a2e00a (diff) | |
| parent | 3e53a496f7dcf9f73d1c0a5853c5752c6126f8f9 (diff) | |
| download | mariadb-git-bb-10.5-MDEV-23190.tar.gz | |
Merge 10.4 into 10.5bb-10.5-MDEV-23190
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 95d1c84a811..da86bbc3a37 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4106,8 +4106,10 @@ static int init_common_variables() get corrupted if accesses with names of different case. */ DBUG_PRINT("info", ("lower_case_table_names: %d", lower_case_table_names)); + if(mysql_real_data_home_ptr == NULL || *mysql_real_data_home_ptr == 0) + mysql_real_data_home_ptr= mysql_real_data_home; SYSVAR_AUTOSIZE(lower_case_file_system, - test_if_case_insensitive(mysql_real_data_home)); + test_if_case_insensitive(mysql_real_data_home_ptr)); if (!lower_case_table_names && lower_case_file_system == 1) { if (lower_case_table_names_used) @@ -4124,7 +4126,7 @@ static int init_common_variables() { if (global_system_variables.log_warnings) sql_print_warning("Setting lower_case_table_names=2 because file " - "system for %s is case insensitive", mysql_real_data_home); + "system for %s is case insensitive", mysql_real_data_home_ptr); SYSVAR_AUTOSIZE(lower_case_table_names, 2); } } @@ -4135,7 +4137,7 @@ static int init_common_variables() sql_print_warning("lower_case_table_names was set to 2, even though your " "the file system '%s' is case sensitive. Now setting " "lower_case_table_names to 0 to avoid future problems.", - mysql_real_data_home); + mysql_real_data_home_ptr); SYSVAR_AUTOSIZE(lower_case_table_names, 0); } else |