summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authordlenev@brandersnatch.localdomain <>2004-05-25 02:30:09 +0400
committerdlenev@brandersnatch.localdomain <>2004-05-25 02:30:09 +0400
commita5fab72bc4bb515fd41b06889bdb674437971d9c (patch)
tree119a674dda0b33de1242b4a42401b1c5f8f7c66a /sql/sql_table.cc
parent1b61cb6d0f5dbea8c3901f509b2f99b4d8c618f4 (diff)
downloadmariadb-git-a5fab72bc4bb515fd41b06889bdb674437971d9c.tar.gz
Fix for sporadically failures of innodb.test on Darwin 7.3
which occured because we were not lowering case of file names for temporary tables altough handler assumes so if lower_case_table_names==2. Now we are lowering case for them.
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 9fe61e06d83..8ed18f5e125 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1159,6 +1159,8 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
my_snprintf(path, sizeof(path), "%s%s%lx_%lx_%x%s",
mysql_tmpdir, tmp_file_prefix, current_pid, thd->thread_id,
thd->tmp_table++, reg_ext);
+ if (lower_case_table_names)
+ my_casedn_str(files_charset_info, path);
create_info->table_options|=HA_CREATE_DELAY_KEY_WRITE;
}
else
@@ -2086,6 +2088,8 @@ int mysql_create_like_table(THD* thd, TABLE_LIST* table,
my_snprintf(dst_path, sizeof(dst_path), "%s%s%lx_%lx_%x%s",
mysql_tmpdir, tmp_file_prefix, current_pid,
thd->thread_id, thd->tmp_table++, reg_ext);
+ if (lower_case_table_names)
+ my_casedn_str(files_charset_info, dst_path);
create_info->table_options|= HA_CREATE_DELAY_KEY_WRITE;
}
else
@@ -3044,6 +3048,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
thd->proc_info="rename result table";
my_snprintf(old_name, sizeof(old_name), "%s2-%lx-%lx", tmp_file_prefix,
current_pid, thd->thread_id);
+ if (lower_case_table_names)
+ my_casedn_str(files_charset_info, old_name);
if (new_name != table_name || new_db != db)
{
if (!access(new_name_buff,F_OK))