mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 03:51:50 +01:00
merging with local branch.
This commit is contained in:
Anurag Shekhar
commit
1eba4182ef
4 changed files with 234 additions and 13 deletions
107
mysql-test/r/partition_not_embedded.result
Normal file
107
mysql-test/r/partition_not_embedded.result
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
DROP TABLE IF EXISTS t1, t2;
|
||||
# Bug#30102 test
|
||||
CREATE TABLE t1 (a INT)
|
||||
PARTITION BY RANGE (a)
|
||||
(PARTITION p0 VALUES LESS THAN (6),
|
||||
PARTITION `p1....................` VALUES LESS THAN (9),
|
||||
PARTITION p2 VALUES LESS THAN MAXVALUE);
|
||||
# List of files in database `test`, all original t1-files here
|
||||
t1#P#p0.MYD
|
||||
t1#P#p0.MYI
|
||||
t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD
|
||||
t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI
|
||||
t1#P#p2.MYD
|
||||
t1#P#p2.MYI
|
||||
t1.frm
|
||||
t1.par
|
||||
INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
|
||||
# Renaming to a file name where the first partition is 250 chars
|
||||
# and the second partition is 350 chars
|
||||
RENAME TABLE t1 TO `t2_new..............................................end`;
|
||||
Got one of the listed errors
|
||||
# List of files in database `test`, should not be any t2-files here
|
||||
# List of files in database `test`, should be all t1-files here
|
||||
t1#P#p0.MYD
|
||||
t1#P#p0.MYI
|
||||
t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD
|
||||
t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI
|
||||
t1#P#p2.MYD
|
||||
t1#P#p2.MYI
|
||||
t1.frm
|
||||
t1.par
|
||||
SELECT * FROM t1;
|
||||
a
|
||||
1
|
||||
10
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
# Renaming to a file name where the first partition is 155 chars
|
||||
# and the second partition is 255 chars
|
||||
RENAME TABLE t1 TO `t2_............................end`;
|
||||
# List of files in database `test`, should not be any t1-files here
|
||||
# List of files in database `test`, should be all t2-files here
|
||||
t2_@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002eend#P#p0.MYD
|
||||
t2_@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002eend#P#p0.MYI
|
||||
t2_@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002eend#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD
|
||||
t2_@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002eend#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI
|
||||
t2_@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002eend#P#p2.MYD
|
||||
t2_@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002eend#P#p2.MYI
|
||||
t2_@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002eend.frm
|
||||
t2_@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002eend.par
|
||||
SELECT * FROM `t2_............................end`;
|
||||
a
|
||||
1
|
||||
10
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
RENAME TABLE `t2_............................end` to t1;
|
||||
# List of files in database `test`, should be all t1-files here
|
||||
t1#P#p0.MYD
|
||||
t1#P#p0.MYI
|
||||
t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD
|
||||
t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI
|
||||
t1#P#p2.MYD
|
||||
t1#P#p2.MYI
|
||||
t1.frm
|
||||
t1.par
|
||||
# Renaming to a file name where the first partition is 156 chars
|
||||
# and the second partition is 256 chars
|
||||
RENAME TABLE t1 TO `t2_............................_end`;
|
||||
Got one of the listed errors
|
||||
# List of files in database `test`, should not be any t2-files here
|
||||
# List of files in database `test`, should be all t1-files here
|
||||
t1#P#p0.MYD
|
||||
t1#P#p0.MYI
|
||||
t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD
|
||||
t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI
|
||||
t1#P#p2.MYD
|
||||
t1#P#p2.MYI
|
||||
t1.frm
|
||||
t1.par
|
||||
SELECT * FROM t1;
|
||||
a
|
||||
1
|
||||
10
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
DROP TABLE t1;
|
||||
# Should not be any files left here
|
||||
# End of bug#30102 test.
|
||||
69
mysql-test/t/partition_not_embedded.test
Normal file
69
mysql-test/t/partition_not_embedded.test
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
-- source include/have_partition.inc
|
||||
-- source include/not_embedded.inc
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS t1, t2;
|
||||
--enable_warnings
|
||||
let $MYSQLD_DATADIR= `SELECT @@datadir`;
|
||||
|
||||
#
|
||||
# Bug#30102: rename table does corrupt tables with partition files on failure
|
||||
#
|
||||
--echo # Bug#30102 test
|
||||
CREATE TABLE t1 (a INT)
|
||||
PARTITION BY RANGE (a)
|
||||
(PARTITION p0 VALUES LESS THAN (6),
|
||||
PARTITION `p1....................` VALUES LESS THAN (9),
|
||||
PARTITION p2 VALUES LESS THAN MAXVALUE);
|
||||
# partition p1 is 't1#P#p1' + @002e * 20 = 107 characters + file ending
|
||||
# total path lenght of './test/t1#P#p1@002e@002e<...>@002e.MY[ID]' is 118 chars
|
||||
--echo # List of files in database `test`, all original t1-files here
|
||||
--list_files $MYSQLD_DATADIR/test t1*
|
||||
INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
|
||||
--echo # Renaming to a file name where the first partition is 250 chars
|
||||
--echo # and the second partition is 350 chars
|
||||
# 7,7 avoids the error message, which is not deterministic.
|
||||
--error 7,7
|
||||
RENAME TABLE t1 TO `t2_new..............................................end`;
|
||||
# 1234567890123456789012345678901234567890123456
|
||||
--echo # List of files in database `test`, should not be any t2-files here
|
||||
--list_files $MYSQLD_DATADIR/test t2*
|
||||
--echo # List of files in database `test`, should be all t1-files here
|
||||
--list_files $MYSQLD_DATADIR/test t1*
|
||||
--sorted_result
|
||||
SELECT * FROM t1;
|
||||
--echo # Renaming to a file name where the first partition is 155 chars
|
||||
--echo # and the second partition is 255 chars
|
||||
RENAME TABLE t1 TO `t2_............................end`;
|
||||
# 1234567890123456789012345678
|
||||
# t2_ + end
|
||||
# .MY[ID] or .frm
|
||||
# #P#p[012]
|
||||
# 28 * @002e
|
||||
# 6 + 4 + 5 + 28 * 5 = 155
|
||||
--echo # List of files in database `test`, should not be any t1-files here
|
||||
--list_files $MYSQLD_DATADIR/test t1*
|
||||
--echo # List of files in database `test`, should be all t2-files here
|
||||
--list_files $MYSQLD_DATADIR/test t2*
|
||||
--sorted_result
|
||||
SELECT * FROM `t2_............................end`;
|
||||
RENAME TABLE `t2_............................end` to t1;
|
||||
--echo # List of files in database `test`, should be all t1-files here
|
||||
--list_files $MYSQLD_DATADIR/test t1*
|
||||
--echo # Renaming to a file name where the first partition is 156 chars
|
||||
--echo # and the second partition is 256 chars
|
||||
# 7,7 avoids the error message, which is not deterministic.
|
||||
--error 7,7
|
||||
RENAME TABLE t1 TO `t2_............................_end`;
|
||||
# 1234567890123456789012345678
|
||||
# 7 + 4 + 5 + 28 * 5 = 16 + 140 = 156
|
||||
--echo # List of files in database `test`, should not be any t2-files here
|
||||
--list_files $MYSQLD_DATADIR/test t2*
|
||||
--echo # List of files in database `test`, should be all t1-files here
|
||||
--list_files $MYSQLD_DATADIR/test t1*
|
||||
--sorted_result
|
||||
SELECT * FROM t1;
|
||||
DROP TABLE t1;
|
||||
--echo # Should not be any files left here
|
||||
--list_files $MYSQLD_DATADIR/test t1*
|
||||
--list_files $MYSQLD_DATADIR/test t2*
|
||||
--echo # End of bug#30102 test.
|
||||
|
|
@ -423,12 +423,9 @@ bool ha_partition::initialize_partition(MEM_ROOT *mem_root)
|
|||
|
||||
int ha_partition::delete_table(const char *name)
|
||||
{
|
||||
int error;
|
||||
DBUG_ENTER("ha_partition::delete_table");
|
||||
|
||||
if ((error= del_ren_cre_table(name, NULL, NULL, NULL)))
|
||||
DBUG_RETURN(error);
|
||||
DBUG_RETURN(handler::delete_table(name));
|
||||
DBUG_RETURN(del_ren_cre_table(name, NULL, NULL, NULL));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -456,12 +453,9 @@ int ha_partition::delete_table(const char *name)
|
|||
|
||||
int ha_partition::rename_table(const char *from, const char *to)
|
||||
{
|
||||
int error;
|
||||
DBUG_ENTER("ha_partition::rename_table");
|
||||
|
||||
if ((error= del_ren_cre_table(from, to, NULL, NULL)))
|
||||
DBUG_RETURN(error);
|
||||
DBUG_RETURN(handler::rename_table(from, to));
|
||||
DBUG_RETURN(del_ren_cre_table(from, to, NULL, NULL));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1807,6 +1801,15 @@ uint ha_partition::del_ren_cre_table(const char *from,
|
|||
DBUG_PRINT("enter", ("from: (%s) to: (%s)", from, to));
|
||||
name_buffer_ptr= m_name_buffer_ptr;
|
||||
file= m_file;
|
||||
if (to == NULL && table_arg == NULL)
|
||||
{
|
||||
/*
|
||||
Delete table, start by delete the .par file. If error, break, otherwise
|
||||
delete as much as possible.
|
||||
*/
|
||||
if ((error= handler::delete_table(from)))
|
||||
DBUG_RETURN(error);
|
||||
}
|
||||
/*
|
||||
Since ha_partition has HA_FILE_BASED, it must alter underlying table names
|
||||
if they do not have HA_FILE_BASED and lower_case_table_names == 2.
|
||||
|
|
@ -1828,6 +1831,8 @@ uint ha_partition::del_ren_cre_table(const char *from,
|
|||
create_partition_name(to_buff, to_path, name_buffer_ptr,
|
||||
NORMAL_PART_NAME, FALSE);
|
||||
error= (*file)->ha_rename_table(from_buff, to_buff);
|
||||
if (error)
|
||||
goto rename_error;
|
||||
}
|
||||
else if (table_arg == NULL) // delete branch
|
||||
error= (*file)->ha_delete_table(from_buff);
|
||||
|
|
@ -1843,6 +1848,15 @@ uint ha_partition::del_ren_cre_table(const char *from,
|
|||
save_error= error;
|
||||
i++;
|
||||
} while (*(++file));
|
||||
if (to != NULL)
|
||||
{
|
||||
if ((error= handler::rename_table(from, to)))
|
||||
{
|
||||
/* Try to revert everything, ignore errors */
|
||||
(void) handler::rename_table(to, from);
|
||||
goto rename_error;
|
||||
}
|
||||
}
|
||||
DBUG_RETURN(save_error);
|
||||
create_error:
|
||||
name_buffer_ptr= m_name_buffer_ptr;
|
||||
|
|
@ -1850,7 +1864,21 @@ create_error:
|
|||
{
|
||||
create_partition_name(from_buff, from_path, name_buffer_ptr, NORMAL_PART_NAME,
|
||||
FALSE);
|
||||
VOID((*file)->ha_delete_table((const char*) from_buff));
|
||||
(void) (*file)->ha_delete_table((const char*) from_buff);
|
||||
name_buffer_ptr= strend(name_buffer_ptr) + 1;
|
||||
}
|
||||
DBUG_RETURN(error);
|
||||
rename_error:
|
||||
name_buffer_ptr= m_name_buffer_ptr;
|
||||
for (abort_file= file, file= m_file; file < abort_file; file++)
|
||||
{
|
||||
/* Revert the rename, back from 'to' to the original 'from' */
|
||||
create_partition_name(from_buff, from_path, name_buffer_ptr,
|
||||
NORMAL_PART_NAME, FALSE);
|
||||
create_partition_name(to_buff, to_path, name_buffer_ptr,
|
||||
NORMAL_PART_NAME, FALSE);
|
||||
/* Ignore error here */
|
||||
(void) (*file)->ha_rename_table(to_buff, from_buff);
|
||||
name_buffer_ptr= strend(name_buffer_ptr) + 1;
|
||||
}
|
||||
DBUG_RETURN(error);
|
||||
|
|
|
|||
|
|
@ -2973,6 +2973,7 @@ uint handler::get_dup_key(int error)
|
|||
*/
|
||||
int handler::delete_table(const char *name)
|
||||
{
|
||||
int saved_error= 0;
|
||||
int error= 0;
|
||||
int enoent_or_zero= ENOENT; // Error if no file was deleted
|
||||
char buff[FN_REFLEN];
|
||||
|
|
@ -2982,21 +2983,31 @@ int handler::delete_table(const char *name)
|
|||
fn_format(buff, name, "", *ext, MY_UNPACK_FILENAME|MY_APPEND_EXT);
|
||||
if (my_delete_with_symlink(buff, MYF(0)))
|
||||
{
|
||||
if ((error= my_errno) != ENOENT)
|
||||
break;
|
||||
if (my_errno != ENOENT)
|
||||
{
|
||||
/*
|
||||
If error on the first existing file, return the error.
|
||||
Otherwise delete as much as possible.
|
||||
*/
|
||||
if (enoent_or_zero)
|
||||
return my_errno;
|
||||
saved_error= my_errno;
|
||||
}
|
||||
}
|
||||
else
|
||||
enoent_or_zero= 0; // No error for ENOENT
|
||||
error= enoent_or_zero;
|
||||
}
|
||||
return error;
|
||||
return saved_error ? saved_error : error;
|
||||
}
|
||||
|
||||
|
||||
int handler::rename_table(const char * from, const char * to)
|
||||
{
|
||||
int error= 0;
|
||||
for (const char **ext= bas_ext(); *ext ; ext++)
|
||||
const char **ext, **start_ext;
|
||||
start_ext= bas_ext();
|
||||
for (ext= start_ext; *ext ; ext++)
|
||||
{
|
||||
if (rename_file_ext(from, to, *ext))
|
||||
{
|
||||
|
|
@ -3005,6 +3016,12 @@ int handler::rename_table(const char * from, const char * to)
|
|||
error= 0;
|
||||
}
|
||||
}
|
||||
if (error)
|
||||
{
|
||||
/* Try to revert the rename. Ignore errors. */
|
||||
for (; ext >= start_ext; ext--)
|
||||
rename_file_ext(to, from, *ext);
|
||||
}
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue