Commit 60a4f50c authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-kt 

into  production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt


sql/mysqld.cc:
  Auto merged
parents d166ede9 29e946ee

sql/mysqld.cc

+2 −3
Original line number Diff line number Diff line
@@ -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)

    {