mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
d74d95961a
ALTER TABLE IMPORT doesn't properly handle instant alter metadata.
This patch makes IMPORT read, parse and apply instant alter metadata at the
very beginning of operation. So, cases when source table has some metadata
and destination table doesn't have it now works fine.
DISCARD already removes instant metadata so importing normal table into
instant table worked fine before this patch.
decrypt_decompress(): decrypts and decompresses page if needed
handle_instant_metadata(): this should be the first thing to read source
table. Basically, it applies instant metadata to a destination
dict_table_t object. This is the first thing to read FSP flags so
all possible checks of it were moved to this function.
PageConverter::update_index_page(): it doesn't now read instant metadata.
This logic were moved into handle_instant_metadata()
row_import::match_flags(): this is a first part row_import::match_schema().
As a separate function it's used by handle_instant_metadata().
fil_space_t::is_full_crc32_compressed(): added convenient function
ha_innobase::discard_or_import_tablespace(): do not reload table definition
to read instant metadata because handle_instant_metadata() does it better.
The reverted code was originally added in
4e7ee166a9
ANONYMOUS_VAR: this is a handy thing to use along with make_scope_exit()
full_crc32_import.test shows different results, because no
dict_table_close() and dict_table_open_on_id() happens.
Thus, SHOW CREATE TABLE shows a little bit older table definition.
52 lines
1.3 KiB
Text
52 lines
1.3 KiB
Text
--source include/have_innodb.inc
|
|
--source include/have_sequence.inc
|
|
--source include/have_file_key_management_plugin.inc
|
|
|
|
SET GLOBAL innodb_encrypt_tables = ON;
|
|
SET GLOBAL innodb_encryption_threads = 4;
|
|
|
|
|
|
--let $MYSQLD_DATADIR= `SELECT @@datadir`
|
|
|
|
CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, i2 INT, i1 INT)
|
|
ENGINE=INNODB ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
|
|
|
|
INSERT INTO t1 (i2) SELECT 4 FROM seq_1_to_1024;
|
|
ALTER TABLE t1 DROP COLUMN i2, ALGORITHM=INSTANT;
|
|
|
|
CREATE TABLE t2 LIKE t1;
|
|
ALTER TABLE t2 DISCARD TABLESPACE;
|
|
|
|
FLUSH TABLE t1 FOR EXPORT;
|
|
|
|
--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t2.ibd
|
|
--copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/test/t2.cfg
|
|
|
|
UNLOCK TABLES;
|
|
ALTER TABLE t2 IMPORT TABLESPACE;
|
|
|
|
DROP TABLE t2, t1;
|
|
|
|
|
|
CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, i2 INT, i1 INT)
|
|
ENGINE=INNODB ENCRYPTED=YES ENCRYPTION_KEY_ID=4 PAGE_COMPRESSED=1;
|
|
|
|
INSERT INTO t1 (i2) SELECT 4 FROM seq_1_to_1024;
|
|
ALTER TABLE t1 DROP COLUMN i2, ALGORITHM=INSTANT;
|
|
|
|
CREATE TABLE t2 LIKE t1;
|
|
ALTER TABLE t2 DISCARD TABLESPACE;
|
|
|
|
FLUSH TABLE t1 FOR EXPORT;
|
|
|
|
--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t2.ibd
|
|
--copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/test/t2.cfg
|
|
|
|
UNLOCK TABLES;
|
|
ALTER TABLE t2 IMPORT TABLESPACE;
|
|
|
|
DROP TABLE t2, t1;
|
|
|
|
|
|
SET GLOBAL innodb_encrypt_tables = OFF;
|
|
SET GLOBAL innodb_encryption_threads = 0;
|