summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2017-11-01 00:30:46 +0300
committerAleksey Midenkov <midenok@gmail.com>2017-11-13 19:11:04 +0300
commita80c71dfbb18c938c2f83587067cdf936d4db8e8 (patch)
tree70c624a909c16554252d3d47c35e235974b14079
parent70a4659d0e263771841813ac10870b8d146f8c0d (diff)
downloadmariadb-git-a80c71dfbb18c938c2f83587067cdf936d4db8e8.tar.gz
Scripts: bootstrap fix [#307]
-rw-r--r--mysql-test/suite/versioning/r/ddl.result2
-rw-r--r--mysql-test/suite/versioning/r/vtmd.result2
-rw-r--r--scripts/mysql_system_tables.sql2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/versioning/r/ddl.result b/mysql-test/suite/versioning/r/ddl.result
index 759cb5f449a..e18082785a9 100644
--- a/mysql-test/suite/versioning/r/ddl.result
+++ b/mysql-test/suite/versioning/r/ddl.result
@@ -179,7 +179,7 @@ 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)',
+ `name` varchar(64) COLLATE utf8_bin NOT NULL COMMENT 'Table name during current lifetime period',
`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`),
diff --git a/mysql-test/suite/versioning/r/vtmd.result b/mysql-test/suite/versioning/r/vtmd.result
index a91ab015ba6..3dd31abea0d 100644
--- a/mysql-test/suite/versioning/r/vtmd.result
+++ b/mysql-test/suite/versioning/r/vtmd.result
@@ -66,7 +66,7 @@ Table Create Table
t0_vtmd CREATE TABLE `t0_vtmd` (
`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)',
+ `name` varchar(64) COLLATE utf8_bin NOT NULL COMMENT 'Table name during current lifetime period',
`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`),
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index 3fa85867709..4a870de974b 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -134,7 +134,7 @@ SET @create_innodb_index_stats="CREATE TABLE IF NOT EXISTS innodb_index_stats (
SET @create_vtmd_template="CREATE OR REPLACE TABLE 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)',
+ name VARCHAR(64) NOT NULL COMMENT 'Table name during current lifetime period',
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),