Tests: results update in sys_vars, funcs_1 suites

MariaDB · Sep 6, 2017 · 40e3922 · 40e3922
1 parent 88ccf75
commit 40e3922
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result
@@ -265,9 +265,9 @@ def	mysql	user	Update_priv	6	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	e
 def	mysql	user	User	2		NO	char	80	240	NULL	NULL	NULL	utf8	utf8_bin	char(80)	PRI		select,insert,update,references		NEVER	NULL
 def	mysql	user	x509_issuer	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references		NEVER	NULL
 def	mysql	user	x509_subject	36	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references		NEVER	NULL
-def	mysql	vtmd_template	col_renames	5	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references	Column name mapping from previous lifetime	NEVER	NULL
+def	mysql	vtmd_template	archive_name	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	MUL		select,insert,update,references	Name of archive table	NEVER	NULL
+def	mysql	vtmd_template	col_renames	5	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references	Column name mappings from previous lifetime	NEVER	NULL
 def	mysql	vtmd_template	end	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	TRX_ID of table lifetime end	NEVER	NULL
-def	mysql	vtmd_template	frm_image	4	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references	Table structure during period [start, end)	NEVER	NULL
 def	mysql	vtmd_template	name	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)			select,insert,update,references	Table name during period [start, end)	NEVER	NULL
 def	mysql	vtmd_template	start	1	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references	TRX_ID of table lifetime start	NEVER	NULL
 ##########################################################################
@@ -608,5 +608,5 @@ NULL	mysql	user	max_statement_time	decimal	NULL	NULL	NULL	NULL	decimal(12,6)
 NULL	mysql	vtmd_template	start	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	vtmd_template	end	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	mysql	vtmd_template	name	varchar	64	192	utf8	utf8_bin	varchar(64)
-1.0000	mysql	vtmd_template	frm_image	blob	65535	65535	NULL	NULL	blob
+3.0000	mysql	vtmd_template	archive_name	varchar	64	192	utf8	utf8_bin	varchar(64)
 1.0000	mysql	vtmd_template	col_renames	blob	65535	65535	NULL	NULL	blob
diff --git a/mysql-test/suite/funcs_1/r/is_statistics_mysql.result b/mysql-test/suite/funcs_1/r/is_statistics_mysql.result
@@ -79,6 +79,7 @@ def	mysql	time_zone_transition_type	0	mysql	PRIMARY	1	Time_zone_id	A	#CARD#	NULL
 def	mysql	time_zone_transition_type	0	mysql	PRIMARY	2	Transition_type_id	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	user	0	mysql	PRIMARY	1	Host	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	user	0	mysql	PRIMARY	2	User	A	#CARD#	NULL	NULL		BTREE		
+def	mysql	vtmd_template	1	mysql	archive_name	1	archive_name	A	#CARD#	NULL	NULL	YES	BTREE		
 def	mysql	vtmd_template	0	mysql	PRIMARY	1	end	A	#CARD#	NULL	NULL		BTREE		
 connect  testuser1,localhost,testuser1,,db_datadict;
 SELECT * FROM information_schema.statistics

diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -5119,6 +5119,20 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NEVER,COMPLEMENTARY,PREFERABLY
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	VERSIONING_ALTER_HISTORY
+SESSION_VALUE	KEEP
+GLOBAL_VALUE	KEEP
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	KEEP
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	ENUM
+VARIABLE_COMMENT	Versioning ALTER TABLE mode
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	KEEP,SURVIVE,DROP
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	VERSIONING_CURRENT_TIMESTAMP
 SESSION_VALUE	NOW
 GLOBAL_VALUE	NOW
@@ -5133,20 +5147,6 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	VERSIONING_DDL_SURVIVAL
-SESSION_VALUE	OFF
-GLOBAL_VALUE	OFF
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Use system versioning DDL survival feature
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	VERSIONING_FORCE
 SESSION_VALUE	OFF
 GLOBAL_VALUE	OFF