Merging mysql-next-mr-merge to mysql-next-mr.

1 files changed, 3 insertions, 3 deletions

diff --git a/mysql-test/r/signal.result b/mysql-test/r/signal.result
index e20c6ee7455..7fb09b87778 100644
--- a/mysql-test/r/signal.result
+++ b/mysql-test/r/signal.result
@@ -2332,21 +2332,21 @@ DECLARE céèçà foo CONDITION FOR SQLSTATE '12345';
 SIGNAL céèçà SET MYSQL_ERRNO = 1000;
 end $$
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '©Ã¨Ã§Ã  foo CONDITION FOR SQLSTATE '12345';
-SIGNAL céèçà SET MYSQL_ERRNO = 1' at line 3
+SIGNAL céèçà SET ' at line 3
 create procedure test_signal()
 begin
 DECLARE "céèçà" CONDITION FOR SQLSTATE '12345';
 SIGNAL "céèçà" SET MYSQL_ERRNO = 1000;
 end $$
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"céèçà" CONDITION FOR SQLSTATE '12345';
-SIGNAL "céèçà" SET MYSQL_ERRNO =' at line 3
+SIGNAL "céèçà" S' at line 3
 create procedure test_signal()
 begin
 DECLARE 'céèçà' CONDITION FOR SQLSTATE '12345';
 SIGNAL 'céèçà' SET MYSQL_ERRNO = 1000;
 end $$
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''céèçà' CONDITION FOR SQLSTATE '12345';
-SIGNAL 'céèçà' SET MYSQL_ERRNO =' at line 3
+SIGNAL 'céèçà' S' at line 3
 create procedure test_signal()
 begin
 DECLARE `céèçà` CONDITION FOR SQLSTATE '12345';