Skip to content

Commit f0c19b6

Browse files
committed
MDEV-11730 Memory leak in innodb.innodb_corrupt_bit
Memory was leaked when ALTER TABLE is attempted on a table that contains corrupted indexes. The memory leak was reported by AddressSanitizer for the test innodb.innodb_corrupt_bit. The leak was introduced into MariaDB Server 10.0.26, 10.1.15, 10.2.1 by the following: commit c081c97 Merge: 1d21b22 a482e76 Author: Sergei Golubchik <serg@mariadb.org> Date: Tue Jun 21 14:11:02 2016 +0200 Merge branch '5.5' into bb-10.0
1 parent 9bf9270 commit f0c19b6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

storage/innobase/handler/handler0alter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3890,7 +3890,7 @@ ha_innobase::prepare_inplace_alter_table(
38903890
index->name, TRUE);
38913891

38923892
my_error(ER_INDEX_CORRUPT, MYF(0), index_name);
3893-
DBUG_RETURN(true);
3893+
goto err_exit;
38943894
}
38953895
}
38963896
}

storage/xtradb/handler/handler0alter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3904,7 +3904,7 @@ ha_innobase::prepare_inplace_alter_table(
39043904
index->name, TRUE);
39053905

39063906
my_error(ER_INDEX_CORRUPT, MYF(0), index_name);
3907-
DBUG_RETURN(true);
3907+
goto err_exit;
39083908
}
39093909
}
39103910
}

0 commit comments

Comments
 (0)