diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-05-25 02:31:15 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-05-25 02:31:15 +0400 |
| commit | 8855e70bb4affb3c75c8175491a977a2ebbd30df (patch) | |
| tree | ebd8c15b0b5319e1b531cce34248187644b6302f | |
| parent | eff961a9ace8fed0f6e65f4872e28f2d4a150226 (diff) | |
| parent | ecc3d34c5e27598b76045d2bc3568b25a68ef5ba (diff) | |
| download | mariadb-git-8855e70bb4affb3c75c8175491a977a2ebbd30df.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
sql/sql_select.cc:
Auto merged
| -rw-r--r-- | sql/sql_select.cc | 3 | ||||
| -rw-r--r-- | sql/sql_table.cc | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 062fcbd1976..c3bbae1390c 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4909,6 +4909,9 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, else // if we run out of slots or we are not using tempool sprintf(path,"%s%s%lx_%lx_%x",mysql_tmpdir,tmp_file_prefix,current_pid, thd->thread_id, thd->tmp_table++); + + if (lower_case_table_names) + my_casedn_str(files_charset_info, path); if (group) { 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)) |