Re-record failing SEQUENCE tests

MariaDB · Jun 14, 2017 · 3b1921c · 3b1921c
1 parent 8a65b49
commit 3b1921c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/mysql-test/suite/rpl/r/sequence.result b/mysql-test/suite/rpl/r/sequence.result
@@ -38,7 +38,7 @@ insert into t1 select * from s1;
 insert into s1 values(-100,-1000,9223372036854775806,1,1,1000,0,0);
 insert into t1 select * from s1;
 select * from t1;
-next_value	min_value	max_value	start	increment	cache	cycle	round
+next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_size	cycle_option	cycle_count
 1	1	9223372036854775806	1	1	10	0	0
 21	1	9223372036854775806	1	1	10	0	0
 21	1	9223372036854775806	1	1	10	0	0
@@ -47,7 +47,7 @@ next_value	min_value	max_value	start	increment	cache	cycle	round
 -100	-1000	9223372036854775806	1	1	1000	0	0
 connection slave;
 select * from t1;
-next_value	min_value	max_value	start	increment	cache	cycle	round
+next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_size	cycle_option	cycle_count
 1	1	9223372036854775806	1	1	10	0	0
 21	1	9223372036854775806	1	1	10	0	0
 21	1	9223372036854775806	1	1	10	0	0
@@ -56,7 +56,7 @@ next_value	min_value	max_value	start	increment	cache	cycle	round
 -100	-1000	9223372036854775806	1	1	1000	0	0
 connection slave2;
 select * from t1;
-next_value	min_value	max_value	start	increment	cache	cycle	round
+next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_size	cycle_option	cycle_count
 1	1	9223372036854775806	1	1	10	0	0
 21	1	9223372036854775806	1	1	10	0	0
 21	1	9223372036854775806	1	1	10	0	0
@@ -69,14 +69,14 @@ master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; CREATE SEQUENCE s1 cache=10
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE `t1` (
-  `next_value` bigint(21) NOT NULL COMMENT 'next not cached value',
-  `min_value` bigint(21) NOT NULL COMMENT 'min value',
-  `max_value` bigint(21) NOT NULL COMMENT 'max value',
-  `start` bigint(21) NOT NULL COMMENT 'start value',
+  `next_not_cached_value` bigint(21) NOT NULL,
+  `minimum_value` bigint(21) NOT NULL,
+  `maximum_value` bigint(21) NOT NULL,
+  `start_value` bigint(21) NOT NULL COMMENT 'start value when sequences is created or value if RESTART is used',
   `increment` bigint(21) NOT NULL COMMENT 'increment value',
-  `cache` bigint(21) NOT NULL COMMENT 'cache size',
-  `cycle` tinyint(1) unsigned NOT NULL COMMENT 'cycle state',
-  `round` bigint(21) NOT NULL COMMENT 'How many cycles has been done'
+  `cache_size` bigint(21) unsigned NOT NULL,
+  `cycle_option` tinyint(1) unsigned NOT NULL COMMENT '0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed',
+  `cycle_count` bigint(21) NOT NULL COMMENT 'How many cycles have been done'
 ) PAGE_CHECKSUM=1
 master-bin.000001	#	Annotate_rows	#	#	create table t1 select * from s1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

diff --git a/mysql-test/suite/sql_sequence/other.result b/mysql-test/suite/sql_sequence/other.result
@@ -148,3 +148,17 @@ next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_si
 4001	1	9223372036854775806	1	1	1000	0	0
 commit;
 drop sequence s1;
+#
+# Flush tables with read lock
+#
+create sequence s1;
+select next value for s1;
+next value for s1
+1
+flush tables with read lock;
+create sequence s2;
+ERROR HY000: Can't execute the query because you have a conflicting read lock
+select next value for s1;
+ERROR HY000: Can't execute the query because you have a conflicting read lock
+unlock tables;
+drop sequence s1;