Skip to content

MDEV-34951: InnoDB index corruption when renaming key name with same letter to upper case #4906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raghunandanbhat wants to merge 1 commit into
base: 10.6
Choose a base branch
from
+96 −10
Open

MDEV-34951: InnoDB index corruption when renaming key name with same letter to upper case #4906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions mysql-test/main/alter_table.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3131,5 +3131,28 @@ alter table t1 drop constraint t1_fk_t2_id, drop t2_id, drop t2_id;
ERROR 42000: Can't DROP COLUMN `t2_id`; check that it exists
drop table t1, t2;
#
# MDEV-34951: Innodb index corruption when renaming key name with same letter to upper case.
#
CREATE TABLE t (a INT, b INT, KEY(a), KEY(b)) ENGINE=INNODB;
ALTER TABLE t RENAME KEY b TO B;
SELECT * FROM t;
a b
DROP TABLE t;
CREATE TABLE t (c INT UNIQUE) ENGINE=InnoDB;
ALTER TABLE t RENAME KEY c TO C;
SELECT * FROM t;
c
DROP TABLE t;
CREATE TABLE t (c POINT GENERATED ALWAYS AS (POINT(1,1)) UNIQUE) ENGINE=InnoDB;
ALTER TABLE t RENAME KEY c to C;
INSERT INTO t VALUES (1);
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
DROP TABLE t;
CREATE TABLE t (c POINT GENERATED ALWAYS AS (POINT(1,1)) UNIQUE) ENGINE=InnoDB;
ALTER TABLE t RENAME KEY c to C;
INSERT INTO t VALUES (1,1);
ERROR 21S01: Column count doesn't match value count at row 1
DROP TABLE t;
#
# End of 10.6 tests
#
26 changes: 26 additions & 0 deletions mysql-test/main/alter_table.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2417,6 +2417,32 @@ create table t1(id int primary key, t2_id int, constraint t1_fk_t2_id foreign ke
alter table t1 drop constraint t1_fk_t2_id, drop t2_id, drop t2_id;
drop table t1, t2;

--echo #
--echo # MDEV-34951: Innodb index corruption when renaming key name with same letter to upper case.
--echo #

CREATE TABLE t (a INT, b INT, KEY(a), KEY(b)) ENGINE=INNODB;
ALTER TABLE t RENAME KEY b TO B;
SELECT * FROM t;
DROP TABLE t;

CREATE TABLE t (c INT UNIQUE) ENGINE=InnoDB;
ALTER TABLE t RENAME KEY c TO C;
SELECT * FROM t;
DROP TABLE t;

CREATE TABLE t (c POINT GENERATED ALWAYS AS (POINT(1,1)) UNIQUE) ENGINE=InnoDB;
ALTER TABLE t RENAME KEY c to C;
--error ER_CANT_CREATE_GEOMETRY_OBJECT
INSERT INTO t VALUES (1);
DROP TABLE t;

CREATE TABLE t (c POINT GENERATED ALWAYS AS (POINT(1,1)) UNIQUE) ENGINE=InnoDB;
ALTER TABLE t RENAME KEY c to C;
--error ER_WRONG_VALUE_COUNT_ON_ROW
INSERT INTO t VALUES (1,1);
DROP TABLE t;

--echo #
--echo # End of 10.6 tests
--echo #
18 changes: 18 additions & 0 deletions mysql-test/suite/parts/r/alter_table.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,21 @@ PARTITION `p_31` VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB);
ALTER online TABLE t1 MODIFY COLUMN `f4` VARCHAR(500) , ALGORITHM=INSTANT, LOCK=NONE;
drop table t1;
# End of 10.5 tests
#
# MDEV-34951: Innodb index corruption when renaming key name with same letter to upper case.
#
# Tests on partitioned tables
# partitioned table with index 'idx' (lowercase)
CREATE TABLE t_part (a INT, KEY idx(a)) ENGINE=InnoDB
PARTITION BY HASH(a) PARTITIONS 1;
# non-partitioned table with index 'IDX' (uppercase)
CREATE TABLE t_nonpart (a INT, KEY IDX(a)) ENGINE=InnoDB;
INSERT INTO t_part VALUES (1);
# Exchange partition
# ALTER TABLE should fail. Without fix, ALTER TABLE succeeds, SELECT fails.
ALTER TABLE t_part EXCHANGE PARTITION p0 WITH TABLE t_nonpart;
ERROR HY000: Tables have different definitions
SELECT * FROM t_nonpart;
a
DROP TABLE t_part, t_nonpart;
# End of 10.6 tests
24 changes: 24 additions & 0 deletions mysql-test/suite/parts/t/alter_table.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,27 @@ ALTER online TABLE t1 MODIFY COLUMN `f4` VARCHAR(500) , ALGORITHM=INSTANT, LOCK
drop table t1;

--echo # End of 10.5 tests

--echo #
--echo # MDEV-34951: Innodb index corruption when renaming key name with same letter to upper case.
--echo #

--echo # Tests on partitioned tables
--echo # partitioned table with index 'idx' (lowercase)
CREATE TABLE t_part (a INT, KEY idx(a)) ENGINE=InnoDB
PARTITION BY HASH(a) PARTITIONS 1;

--echo # non-partitioned table with index 'IDX' (uppercase)
CREATE TABLE t_nonpart (a INT, KEY IDX(a)) ENGINE=InnoDB;

INSERT INTO t_part VALUES (1);

--echo # Exchange partition
--echo # ALTER TABLE should fail. Without fix, ALTER TABLE succeeds, SELECT fails.
--error ER_TABLES_DIFFERENT_METADATA
ALTER TABLE t_part EXCHANGE PARTITION p0 WITH TABLE t_nonpart;

SELECT * FROM t_nonpart;
DROP TABLE t_part, t_nonpart;

--echo # End of 10.6 tests
15 changes: 5 additions & 10 deletions sql/sql_table.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6935,8 +6935,7 @@ static bool fill_alter_inplace_info(THD *thd, TABLE *table, bool varchar,
new_key < new_key_end;
new_key++)
{
if (!lex_string_cmp(system_charset_info, &table_key->name,
&new_key->name))
if (!cmp(&table_key->name, &new_key->name))
break;
}
if (new_key >= new_key_end)
Expand Down Expand Up @@ -6986,8 +6985,7 @@ static bool fill_alter_inplace_info(THD *thd, TABLE *table, bool varchar,
/* Search an old key with the same name. */
for (table_key= table->key_info; table_key < table_key_end; table_key++)
{
if (!lex_string_cmp(system_charset_info, &table_key->name,
&new_key->name))
if (!cmp(&table_key->name, &new_key->name))
break;
}
if (table_key >= table_key_end)
Expand Down Expand Up @@ -7019,8 +7017,7 @@ static bool fill_alter_inplace_info(THD *thd, TABLE *table, bool varchar,
continue;
}

DBUG_ASSERT(
lex_string_cmp(system_charset_info, &old_key->name, &new_key->name));
DBUG_ASSERT(cmp(&old_key->name, &new_key->name));

ha_alter_info->handler_flags|= ALTER_RENAME_INDEX;
ha_alter_info->rename_keys.push_back(
Expand Down Expand Up @@ -7292,8 +7289,7 @@ bool mysql_compare_tables(TABLE *table, Alter_info *alter_info,
/* Search a key with the same name. */
for (new_key= key_info_buffer; new_key < new_key_end; new_key++)
{
if (!lex_string_cmp(system_charset_info, &table_key->name,
&new_key->name))
if (!cmp(&table_key->name, &new_key->name))
break;
}
if (new_key >= new_key_end)
Expand Down Expand Up @@ -7332,8 +7328,7 @@ bool mysql_compare_tables(TABLE *table, Alter_info *alter_info,
/* Search a key with the same name. */
for (table_key= table->s->key_info; table_key < table_key_end; table_key++)
{
if (!lex_string_cmp(system_charset_info, &table_key->name,
&new_key->name))
if (!cmp(&table_key->name, &new_key->name))
break;
}
if (table_key >= table_key_end)
Expand Down