database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Renamed tmp file using #sql_#_# to #sql-#-#

Browse Source 
This was done to match the naming of the ALTER #sql-#-# tmp files
This commit is contained in:
Monty
2019-05-08 23:20:51 +03:00
parent ebf372ddae
commit e533ba9b84
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@ -17823,12 +17823,12 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
temp_pool_slot = bitmap_lock_set_next(&temp_pool); temp_pool_slot = bitmap_lock_set_next(&temp_pool);
if (temp_pool_slot != MY_BIT_NONE) // we got a slot if (temp_pool_slot != MY_BIT_NONE) // we got a slot
sprintf(path, "%s_%lx_%i", tmp_file_prefix, sprintf(path, "%s-%lx-%i", tmp_file_prefix,
current_pid, temp_pool_slot); current_pid, temp_pool_slot);
else else
{ {
/* if we run out of slots or we are not using tempool */ /* if we run out of slots or we are not using tempool */
sprintf(path, "%s%lx_%lx_%x", tmp_file_prefix,current_pid, sprintf(path, "%s-%lx-%lx-%x", tmp_file_prefix,current_pid,
(ulong) thd->thread_id, thd->tmp_table++); (ulong) thd->thread_id, thd->tmp_table++);
} }

2
sql/sql_table.cc
View File

@ -10224,7 +10224,7 @@ do_continue:;
backup_name.length= my_snprintf(backup_name_buff, sizeof(backup_name_buff), backup_name.length= my_snprintf(backup_name_buff, sizeof(backup_name_buff),
"%s2-%lx-%lx", tmp_file_prefix, "%s2-%lx-%lx", tmp_file_prefix,
current_pid, (long) thd->thread_id); current_pid, (long) thd->thread_id);
if (lower_case_table_names) if (lower_case_table_names)
my_casedn_str(files_charset_info, backup_name_buff); my_casedn_str(files_charset_info, backup_name_buff);
if (mysql_rename_table(old_db_type, &alter_ctx.db, &alter_ctx.table_name, if (mysql_rename_table(old_db_type, &alter_ctx.db, &alter_ctx.table_name,