after merge changes:

* rename all debugging related command-line options
  and variables to start from "debug-", and made them all
  OFF by default.
* replace "MySQL" with "MariaDB" in error messages
* "Cast ... converted ... integer to it's ... complement"
  is now a note, not a warning
* @@query_cache_strip_comments now has a session scope,
  not global.

1 files changed, 2 insertions, 2 deletions

diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
index f18678e3896..03c16d06595 100644
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
@@ -490,7 +490,7 @@ DECLARE condname1 CONDITION CHECK SQLSTATE '23000';
 END;
 DECLARE CONTINUE HANDLER FOR condname1 SET x1 = 1;
 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 'CHECK SQLSTATE '23000';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHECK SQLSTATE '23000';
 END;
 DECLARE CONTINUE HANDLER FOR condname1 SET x1 = 1;
 ' at line 5
@@ -524,7 +524,7 @@ declare undo handler for sqlexception select '1';
 select * from tqq;
 SELECT 'end of 1';
 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 'undo handler for sqlexception select '1';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo handler for sqlexception select '1';
 select * from tqq;
 SELECT 'end of 1';
 ' at line 3