mirror of
https://github.com/MariaDB/server.git
synced 2025-02-10 07:34:11 +01:00
8833c24c61
This reverts commit bdc5548cad
that introduced a work-around to ha_innobase::delete_table()
for avoiding failures when trying to remove table partitions.
This work-around (of not removing statistics in case of a locking
conflict) would occasionally cause a failure of the test
parts.part_supported_sql_func_innodb:
mysqltest: In included file "./suite/parts/inc/partition_supported_sql_funcs.inc":
included from ./suite/parts/inc/part_supported_sql_funcs_main.inc at line 91:
included from /buildbot/amd64-ubuntu-2004-msan/build/mysql-test/suite/parts/t/part_supported_sql_func_innodb.test at line 44:
At line 234: query 'alter table t66
reorganize partition s1 into
(partition p0 values less than ($valsqlfunc),
partition p1 values less than maxvalue)' failed: ER_DUP_KEY (1022): Can't write; duplicate key in table 'mysql.innodb_table_stats'
65 lines
1.7 KiB
Text
65 lines
1.7 KiB
Text
#
|
|
# Test the persistent stats feature when DROPping a table or an
|
|
# index when the corresponding rows in the stats tables are locked
|
|
#
|
|
|
|
-- source include/have_innodb.inc
|
|
|
|
CREATE DATABASE unlocked;
|
|
CREATE TABLE unlocked.t1(a INT PRIMARY KEY) ENGINE=INNODB STATS_PERSISTENT=0;
|
|
CREATE DATABASE locked;
|
|
CREATE TABLE locked.t1(a INT PRIMARY KEY) ENGINE=INNODB STATS_PERSISTENT=1;
|
|
|
|
CREATE TABLE innodb_stats_drop_locked (c INT, KEY c_key (c))
|
|
ENGINE=INNODB STATS_PERSISTENT=1;
|
|
ANALYZE TABLE innodb_stats_drop_locked;
|
|
|
|
BEGIN;
|
|
SELECT table_name FROM mysql.innodb_table_stats
|
|
WHERE table_name='innodb_stats_drop_locked'
|
|
FOR UPDATE;
|
|
SELECT table_name FROM mysql.innodb_index_stats
|
|
WHERE table_name='innodb_stats_drop_locked'
|
|
FOR UPDATE;
|
|
|
|
-- connect (con1,localhost,root,,)
|
|
SET innodb_lock_wait_timeout=1;
|
|
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
ALTER TABLE innodb_stats_drop_locked DROP INDEX c_key;
|
|
|
|
# the index should be gone
|
|
SHOW CREATE TABLE innodb_stats_drop_locked;
|
|
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
DROP TABLE innodb_stats_drop_locked;
|
|
|
|
DROP DATABASE unlocked;
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
DROP DATABASE locked;
|
|
-- disconnect con1
|
|
-- connection default
|
|
COMMIT;
|
|
|
|
DROP DATABASE locked;
|
|
|
|
# the stats should be there
|
|
|
|
SELECT table_name FROM mysql.innodb_table_stats
|
|
WHERE table_name='innodb_stats_drop_locked';
|
|
|
|
SELECT table_name FROM mysql.innodb_index_stats
|
|
WHERE table_name='innodb_stats_drop_locked';
|
|
|
|
ALTER TABLE innodb_stats_drop_locked DROP INDEX c_key;
|
|
|
|
SELECT table_name FROM mysql.innodb_index_stats
|
|
WHERE table_name='innodb_stats_drop_locked';
|
|
|
|
DROP TABLE innodb_stats_drop_locked;
|
|
|
|
SELECT table_name FROM mysql.innodb_table_stats
|
|
WHERE table_name='innodb_stats_drop_locked';
|
|
|
|
SELECT table_name FROM mysql.innodb_index_stats
|
|
WHERE table_name='innodb_stats_drop_locked';
|