Scripts: VTMD schema fix

MariaDB · May 25, 2017 · 1c8a2de · 1c8a2de
1 parent 414651c
commit 1c8a2de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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";