Skip to content

M
MariaDB
Commit 101430a1 authored by Monty's avatar Monty
Browse files
Options

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

This was done to match the naming of the normal #sql_#_# tmp file
parent bb065ce5
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 80 deletions
mysql-test/suite/parts/r/partition_debug_innodb.result
View file @ 101430a1
......@@ -116,8 +116,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -186,8 +186,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -256,8 +256,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -326,8 +326,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -397,8 +397,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -468,8 +468,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -539,8 +539,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -2084,8 +2084,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -2153,8 +2153,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -2222,8 +2222,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -2285,8 +2285,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -2348,8 +2348,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -3701,8 +3701,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -3772,8 +3772,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10.ibd
......@@ -3843,8 +3843,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10#TMP#.ibd
......@@ -3916,8 +3916,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10#TMP#.ibd
......@@ -3989,8 +3989,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10#TMP#.ibd
......@@ -4062,8 +4062,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10#TMP#.ibd
......@@ -4137,8 +4137,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.ibd
t1#P#p10#TMP#.ibd
......
mysql-test/suite/parts/r/partition_debug_myisam.result
View file @ 101430a1
......@@ -121,8 +121,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -197,8 +197,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -273,8 +273,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -349,8 +349,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -427,8 +427,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -505,8 +505,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -583,8 +583,8 @@ ALTER TABLE t1 ADD PARTITION
(PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -2244,8 +2244,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -2319,8 +2319,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -2394,8 +2394,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -2462,8 +2462,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -2530,8 +2530,8 @@ a b
ALTER TABLE t1 DROP PARTITION p10;
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -3967,8 +3967,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -4044,8 +4044,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -4121,8 +4121,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -4202,8 +4202,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -4283,8 +4283,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -4364,8 +4364,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......@@ -4448,8 +4448,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
ERROR HY000: Lost connection to MySQL server during query
# State after crash (before recovery)
#sql-t1.frm
#sql-t1.par
#sql_t1.frm
#sql_t1.par
db.opt
t1#P#p0.MYD
t1#P#p0.MYI
......
sql/sql_select.cc
View file @ 101430a1
......@@ -17828,7 +17828,7 @@ 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%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++);
}
......
sql/sql_table.cc
View file @ 101430a1
......@@ -1760,7 +1760,7 @@ uint build_table_shadow_filename(char *buff, size_t bufflen,
ALTER_PARTITION_PARAM_TYPE *lpt)
{
char tmp_name[FN_REFLEN];
my_snprintf(tmp_name, sizeof (tmp_name), "%s-%s", tmp_file_prefix,
my_snprintf(tmp_name, sizeof (tmp_name), "%s_%s", tmp_file_prefix,
lpt->table_name.str);
return build_table_filename(buff, bufflen, lpt->db.str, tmp_name, "",
FN_IS_TMP);
......@@ -10223,8 +10223,8 @@ do_continue:;
backup_name.str= backup_name_buff;
backup_name.length= my_snprintf(backup_name_buff, sizeof(backup_name_buff),
"%s2-%lx-%lx", tmp_file_prefix,
current_pid, (long) thd->thread_id);
"%s2_%lx_%lx", tmp_file_prefix,
current_pid, (long) thd->thread_id);
if (lower_case_table_names)
my_casedn_str(files_charset_info, backup_name_buff);
if (mysql_rename_table(old_db_type, &alter_ctx.db, &alter_ctx.table_name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7