After-merge fix: Adjust some results.

mysql-test/suite/funcs_1/r/innodb_views.result

@@ -4314,7 +4314,7 @@ CREATE VIEW      v2 AS Select * from test.v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 DROP VIEW IF EXISTS v2;
 Warnings:
-Note	4089	Unknown VIEW: 'test.v2'
+Note	4090	Unknown VIEW: 'test.v2'
 
 Testcase 3.3.1.25 
 --------------------------------------------------------------------------------
@@ -7566,7 +7566,7 @@ Call sp1() ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
 Drop view if exists test.v1 ;
 Warnings:
-Note	4089	Unknown VIEW: 'test.v1'
+Note	4090	Unknown VIEW: 'test.v1'
 Drop procedure sp1 ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
 
@@ -21312,7 +21312,7 @@ CREATE VIEW  v1 AS SELECT f1 FROM t1;
 DROP VIEW IF EXISTS v1;
 DROP VIEW IF EXISTS v1;
 Warnings:
-Note	4089	Unknown VIEW: 'test.v1'
+Note	4090	Unknown VIEW: 'test.v1'
 
 Testcase 3.3.1.68 
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/memory_views.result

@@ -4315,7 +4315,7 @@ CREATE VIEW      v2 AS Select * from test.v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 DROP VIEW IF EXISTS v2;
 Warnings:
-Note	4089	Unknown VIEW: 'test.v2'
+Note	4090	Unknown VIEW: 'test.v2'
 
 Testcase 3.3.1.25 
 --------------------------------------------------------------------------------
@@ -7567,7 +7567,7 @@ Call sp1() ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
 Drop view if exists test.v1 ;
 Warnings:
-Note	4089	Unknown VIEW: 'test.v1'
+Note	4090	Unknown VIEW: 'test.v1'
 Drop procedure sp1 ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
 
@@ -21314,7 +21314,7 @@ CREATE VIEW  v1 AS SELECT f1 FROM t1;
 DROP VIEW IF EXISTS v1;
 DROP VIEW IF EXISTS v1;
 Warnings:
-Note	4089	Unknown VIEW: 'test.v1'
+Note	4090	Unknown VIEW: 'test.v1'
 
 Testcase 3.3.1.68 
 --------------------------------------------------------------------------------

mysql-test/suite/rpl/r/rpl_create_drop_view.result

@@ -99,7 +99,7 @@ DROP VIEW v1;
 ERROR 42S02: Unknown VIEW: 'test.v1'
 DROP VIEW IF EXISTS v2;
 Warnings:
-Note	4089	Unknown VIEW: 'test.v2'
+Note	4090	Unknown VIEW: 'test.v2'
 # Syncing slave with master
 connection slave;
 SELECT * FROM v1;

mysql-test/suite/rpl/r/rpl_sp.result

@@ -128,7 +128,7 @@ show warnings;
 Level	Code	Message
 Error	1062	Duplicate entry '20' for key 'a'
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-Note	4091	At line 4 in mysqltest1.foo4
+Note	4092	At line 4 in mysqltest1.foo4
 select * from t2;
 a
 20
@@ -291,7 +291,7 @@ end|
 do fn1(100);
 Warnings:
 Error	1062	Duplicate entry '100' for key 'a'
-Note	4091	At line 3 in mysqltest1.fn1
+Note	4092	At line 3 in mysqltest1.fn1
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 select fn1(20);
 ERROR 23000: Duplicate entry '20' for key 'a'

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;

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;