summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorrburnett@production.mysql.com <>2006-08-04 21:34:46 +0200
committerrburnett@production.mysql.com <>2006-08-04 21:34:46 +0200
commit609088915f59026233d228df51d741ef26c297fe (patch)
treed0a07532617d82d720442f33a693f31c3f01254e /sql/mysqld.cc
parent86d74dc6dc2947534e601ea8bc3cf7b31673893f (diff)
parentc1786175f2fa58044c6ff121dbc5a5755662fb34 (diff)
downloadmariadb-git-609088915f59026233d228df51d741ef26c297fe.tar.gz
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-kt
into production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 57ee7971c8d..cec313dc8ca 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2738,9 +2738,8 @@ static int init_common_variables(const char *conf_file_name, int argc,
get corrupted if accesses with names of different case.
*/
DBUG_PRINT("info", ("lower_case_table_names: %d", lower_case_table_names));
- if (!lower_case_table_names &&
- (lower_case_file_system=
- (test_if_case_insensitive(mysql_real_data_home) == 1)))
+ lower_case_file_system= test_if_case_insensitive(mysql_real_data_home);
+ if (!lower_case_table_names && lower_case_file_system == 1)
{
if (lower_case_table_names_used)
{