From 1c8a2de73eecef8b53165b9c8c3d001513a7a4c1 Mon Sep 17 00:00:00 2001 From: Aleksey Midenkov Date: Wed, 24 May 2017 18:52:48 +0300 Subject: [PATCH] Scripts: VTMD schema fix --- mysql-test/suite/versioning/r/ddl.result | 6 +++--- scripts/mysql_system_tables.sql | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/suite/versioning/r/ddl.result b/mysql-test/suite/versioning/r/ddl.result index 16e830f21cc..f5d7b024e14 100644 --- a/mysql-test/suite/versioning/r/ddl.result +++ b/mysql-test/suite/versioning/r/ddl.result @@ -162,15 +162,15 @@ drop procedure concat_exec3; drop function get_historical_table_name; drop procedure drop_last_historical; select * from mysql.vtmd_template; -start end name frm_image col_renames +start end name archive_name col_renames show create table mysql.vtmd_template; Table Create Table vtmd_template CREATE TABLE `vtmd_template` ( `start` bigint(20) unsigned GENERATED ALWAYS AS ROW START COMMENT 'TRX_ID of table lifetime start', `end` bigint(20) unsigned GENERATED ALWAYS AS ROW END NOT NULL COMMENT 'TRX_ID of table lifetime end', `name` varchar(64) COLLATE utf8_bin NOT NULL COMMENT 'Table name during period [start, end)', - `frm_image` blob NOT NULL COMMENT 'Table structure during period [start, end)', - `col_renames` blob DEFAULT NULL COMMENT 'Column name mapping from previous lifetime', + `archive_name` varchar(64) COLLATE utf8_bin DEFAULT NULL COMMENT 'Name of archive table', + `col_renames` blob DEFAULT NULL COMMENT 'Column name mappings from previous lifetime', PRIMARY KEY (`end`), PERIOD FOR SYSTEM_TIME (`start`, `end`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 WITH SYSTEM VERSIONING diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index 51e324386c3..ae115b37b9f 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -133,8 +133,8 @@ SET @create_vtmd_template="CREATE TABLE IF NOT EXISTS vtmd_template ( start BIGINT UNSIGNED GENERATED ALWAYS AS ROW START COMMENT 'TRX_ID of table lifetime start', end BIGINT UNSIGNED GENERATED ALWAYS AS ROW END COMMENT 'TRX_ID of table lifetime end', name VARCHAR(64) NOT NULL COMMENT 'Table name during period [start, end)', - frm_image BLOB NOT NULL COMMENT 'Table structure during period [start, end)', - col_renames BLOB COMMENT 'Column name mapping from previous lifetime', + archive_name VARCHAR(64) NULL COMMENT 'Name of archive table', + col_renames BLOB COMMENT 'Column name mappings from previous lifetime', PERIOD FOR SYSTEM_TIME(start, end), PRIMARY KEY (end) ) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 WITH SYSTEM VERSIONING";