Many files:

  Post-merge fix.


mysql-test/r/binlog_unsafe.result:
  Post-merge fix.
mysql-test/r/events_bugs.result:
  Post-merge fix.
mysql-test/r/events_trans.result:
  Post-merge fix.
mysql-test/r/sp.result:
  Post-merge fix.
mysql-test/r/sp_gis.result:
  Post-merge fix.
mysql-test/r/xml.result:
  Post-merge fix.

6 files changed, 26 insertions, 26 deletions

diff --git a/mysql-test/r/binlog_unsafe.result b/mysql-test/r/binlog_unsafe.result
index 624c7feec1f..fb89631f30b 100644
--- a/mysql-test/r/binlog_unsafe.result
+++ b/mysql-test/r/binlog_unsafe.result
@@ -5,9 +5,9 @@ CREATE TABLE t3 (b INT AUTO_INCREMENT PRIMARY KEY);
 CREATE VIEW v1(a,b) AS SELECT a,b FROM t2,t3;
 INSERT INTO t1 SELECT UUID();
 Warnings:
-Warning	1589	Statement is not safe to log in statement format.
+Warning	1590	Statement is not safe to log in statement format.
 SHOW WARNINGS;
 Level	Warning
-Code	1589
+Code	1590
 Message	Statement is not safe to log in statement format.
 DROP TABLE t1,t2,t3;
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result
index 557c8e0b477..6e3b1404048 100644
--- a/mysql-test/r/events_bugs.result
+++ b/mysql-test/r/events_bugs.result
@@ -31,7 +31,7 @@ create event e_55 on schedule at 10000101000000 do drop table t;
 ERROR HY000: Incorrect AT value: '10000101000000'
 create event e_55 on schedule at 20000101000000 do drop table t;
 Warnings:
-Note	1585	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1586	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
 show events;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;
@@ -457,22 +457,22 @@ CREATE EVENT e4 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
 DO
 SELECT 1;
 Warnings:
-Note	1585	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1586	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
 CREATE EVENT e4 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00' DISABLE
 DO
 SELECT 1;
 Warnings:
-Note	1585	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1586	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
 CREATE EVENT e4 ON SCHEDULE AT '1999-01-01 00:00:00' DO
 SELECT 1;
 Warnings:
-Note	1585	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1586	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
 CREATE EVENT e4 ON SCHEDULE AT '1999-01-01 00:00:00' DISABLE
 DO
 SELECT 1;
 Warnings:
-Note	1585	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1586	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 events_test	e1	root@localhost	+05:00	RECURRING	NULL	1	DAY	2006-01-01 00:00:00	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
@@ -482,19 +482,19 @@ The following should succeed giving a warning.
 ALTER EVENT e1 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00' ON COMPLETION PRESERVE;
 Warnings:
-Note	1541	Event execution time is in the past. Event has been disabled
+Note	1542	Event execution time is in the past. Event has been disabled
 CREATE EVENT e4 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00' ON COMPLETION PRESERVE
 DO
 SELECT 1;
 Warnings:
-Note	1541	Event execution time is in the past. Event has been disabled
+Note	1542	Event execution time is in the past. Event has been disabled
 CREATE EVENT e5 ON SCHEDULE AT '1999-01-01 00:00:00'
   ON COMPLETION PRESERVE
 DO
 SELECT 1;
 Warnings:
-Note	1541	Event execution time is in the past. Event has been disabled
+Note	1542	Event execution time is in the past. Event has been disabled
 The following should succeed without warnings.
 ALTER EVENT e2 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00';
 ALTER EVENT e3 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
diff --git a/mysql-test/r/events_trans.result b/mysql-test/r/events_trans.result
index 1f87bcea68e..dce08d3b9f9 100644
--- a/mysql-test/r/events_trans.result
+++ b/mysql-test/r/events_trans.result
@@ -63,7 +63,7 @@ begin work;
 insert into t1 (a) values ("OK: create event if not exists");
 create event if not exists e1 on schedule every 2 day do select 2;
 Warnings:
-Note	1534	Event 'e1' already exists
+Note	1535	Event 'e1' already exists
 rollback work;
 select * from t1;
 a
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index ebdab4a3f89..163bbb4aab4 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -5670,7 +5670,7 @@ drop function if exists pi;
 create function pi() returns varchar(50)
 return "pie, my favorite desert.";
 Warnings:
-Note	1582	This function 'pi' has the same name as a native function
+Note	1583	This function 'pi' has the same name as a native function
 SET @save_sql_mode=@@sql_mode;
 SET SQL_MODE='IGNORE_SPACE';
 select pi(), pi ();
@@ -5719,15 +5719,15 @@ use test;
 create function `database`() returns varchar(50)
 return "Stored function database";
 Warnings:
-Note	1582	This function 'database' has the same name as a native function
+Note	1583	This function 'database' has the same name as a native function
 create function `current_user`() returns varchar(50)
 return "Stored function current_user";
 Warnings:
-Note	1582	This function 'current_user' has the same name as a native function
+Note	1583	This function 'current_user' has the same name as a native function
 create function md5(x varchar(50)) returns varchar(50)
 return "Stored function md5";
 Warnings:
-Note	1582	This function 'md5' has the same name as a native function
+Note	1583	This function 'md5' has the same name as a native function
 SET SQL_MODE='IGNORE_SPACE';
 select database(), database ();
 database()	database ()
diff --git a/mysql-test/r/sp_gis.result b/mysql-test/r/sp_gis.result
index b4fe0872d64..c640e5c46f2 100644
--- a/mysql-test/r/sp_gis.result
+++ b/mysql-test/r/sp_gis.result
@@ -7,11 +7,11 @@ return 1;
 create function x() returns int
 return 2;
 Warnings:
-Note	1582	This function 'x' has the same name as a native function
+Note	1583	This function 'x' has the same name as a native function
 create function y() returns int
 return 3;
 Warnings:
-Note	1582	This function 'y' has the same name as a native function
+Note	1583	This function 'y' has the same name as a native function
 select a();
 a()
 1
diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result
index 95ad19a886f..aac7c4e850a 100644
--- a/mysql-test/r/xml.result
+++ b/mysql-test/r/xml.result
@@ -647,32 +647,32 @@ select extractValue('<a>a','/a');
 extractValue('<a>a','/a')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 5: unexpected END-OF-INPUT'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 5: unexpected END-OF-INPUT'
 select extractValue('<a>a<','/a');
 extractValue('<a>a<','/a')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 6: END-OF-INPUT unexpected (ident or '/' wanted)'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 6: END-OF-INPUT unexpected (ident or '/' wanted)'
 select extractValue('<a>a</','/a');
 extractValue('<a>a</','/a')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 7: END-OF-INPUT unexpected (ident wanted)'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 7: END-OF-INPUT unexpected (ident wanted)'
 select extractValue('<a>a</a','/a');
 extractValue('<a>a</a','/a')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 8: END-OF-INPUT unexpected ('>' wanted)'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 8: END-OF-INPUT unexpected ('>' wanted)'
 select extractValue('<a>a</a></b>','/a');
 extractValue('<a>a</a></b>','/a')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 12: '</b>' unexpected (END-OF-INPUT wanted)'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 12: '</b>' unexpected (END-OF-INPUT wanted)'
 select extractValue('<a b=>a</a>','/a');
 extractValue('<a b=>a</a>','/a')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 7: '>' unexpected (ident or string wanted)'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 7: '>' unexpected (ident or string wanted)'
 select extractValue('<e>1</e>','position()');
 ERROR HY000: XPATH syntax error: ''
 select extractValue('<e>1</e>','last()');
@@ -723,17 +723,17 @@ select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','//*
 extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','//*')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 13: unknown token unexpected (ident or '/' wanted)'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 13: unknown token unexpected (ident or '/' wanted)'
 select extractValue('<.>test</.>','//*');
 extractValue('<.>test</.>','//*')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 2: unknown token unexpected (ident or '/' wanted)'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 2: unknown token unexpected (ident or '/' wanted)'
 select extractValue('<->test</->','//*');
 extractValue('<->test</->','//*')
 NULL
 Warnings:
-Warning	1522	Incorrect XML value: 'parse error at line 1 pos 2: unknown token unexpected (ident or '/' wanted)'
+Warning	1523	Incorrect XML value: 'parse error at line 1 pos 2: unknown token unexpected (ident or '/' wanted)'
 select extractValue('<:>test</:>','//*');
 extractValue('<:>test</:>','//*')
 test