From 72a802421781d7bcab80c5f98f21f1747c54d36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 21 Sep 2017 07:58:08 +0300 Subject: After-merge fix: Adjust some results. --- mysql-test/suite/sql_sequence/alter.result | 2 +- mysql-test/suite/sql_sequence/create.result | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'mysql-test/suite/sql_sequence') diff --git a/mysql-test/suite/sql_sequence/alter.result b/mysql-test/suite/sql_sequence/alter.result index 1d734100d74..0400843c98a 100644 --- a/mysql-test/suite/sql_sequence/alter.result +++ b/mysql-test/suite/sql_sequence/alter.result @@ -212,7 +212,7 @@ ERROR 42S02: 'test.t1' is not a SEQUENCE drop table t1; alter sequence if exists t1 minvalue=100; Warnings: -Note 4088 Unknown SEQUENCE: 'test.t1' +Note 4089 Unknown SEQUENCE: 'test.t1' alter sequence t1 minvalue=100; ERROR 42S02: Table 'test.t1' doesn't exist create sequence t1; diff --git a/mysql-test/suite/sql_sequence/create.result b/mysql-test/suite/sql_sequence/create.result index 2697da1d8ff..a5eb64802db 100644 --- a/mysql-test/suite/sql_sequence/create.result +++ b/mysql-test/suite/sql_sequence/create.result @@ -165,7 +165,7 @@ drop sequence t1; ERROR 42S02: 'test.t1' is not a SEQUENCE drop sequence if exists t1; Warnings: -Note 4088 Unknown SEQUENCE: 'test.t1' +Note 4089 Unknown SEQUENCE: 'test.t1' create sequence t1 start with 10 maxvalue=9; ERROR HY000: Sequence 'test.t1' values are conflicting create sequence t1 minvalue= 100 maxvalue=10; @@ -377,7 +377,7 @@ key key1 (next_not_cached_value) ERROR HY000: Sequence 'test.t1' table structure is invalid (Sequence tables cannot have any keys) drop sequence if exists t1; Warnings: -Note 4088 Unknown SEQUENCE: 'test.t1' +Note 4089 Unknown SEQUENCE: 'test.t1' create sequence t1; create sequence t2; create table t3 (a int) engine=myisam; @@ -387,8 +387,8 @@ CREATE SEQUENCE s1; drop sequence s1; drop sequence if exists t1,t2,t3,t4; Warnings: -Note 4088 Unknown SEQUENCE: 'test.t3' -Note 4088 Unknown SEQUENCE: 'test.t4' +Note 4089 Unknown SEQUENCE: 'test.t3' +Note 4089 Unknown SEQUENCE: 'test.t4' drop table if exists t1,t2,t3; Warnings: Note 1051 Unknown table 'test.t1' @@ -414,9 +414,9 @@ CREATE TABLE t2 (a int); CREATE SEQUENCE s1; drop sequence if exists t1,t2,s1,s2; Warnings: -Note 4088 Unknown SEQUENCE: 'test.t1' -Note 4088 Unknown SEQUENCE: 'test.t2' -Note 4088 Unknown SEQUENCE: 'test.s2' +Note 4089 Unknown SEQUENCE: 'test.t1' +Note 4089 Unknown SEQUENCE: 'test.t2' +Note 4089 Unknown SEQUENCE: 'test.s2' drop table if exists t1,t2; CREATE TEMPORARY SEQUENCE s1; DROP SEQUENCE s1; -- cgit v1.2.1