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, 7 insertions, 7 deletions

diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 7a342f095df..2e90bf8e27b 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -662,7 +662,7 @@ ERROR 42000: Only integers allowed as number here near '0.2+e1' at line 3
 create table t1 (a int)
 partition by key(a)
 partitions -1;
-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 '-1' at line 3
+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 '-1' at line 3
 create table t1 (a int)
 partition by key(a)
 partitions 1.5;
@@ -1216,11 +1216,11 @@ alter table t1
 engine=heap
 partition by key (a)
 (partition p0 engine=heap, partition p1 engine=myisam);
-ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
+ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB
 alter table t1
 partition by key (a)
 (partition p0 engine=heap, partition p1 engine=myisam);
-ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL
+ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB
 drop table t1;
 CREATE TABLE t1 (
 f_int1 INTEGER, f_int2 INTEGER,
@@ -1333,7 +1333,7 @@ create table t1 (a int)
 partition by list (a)
 (partition p0 values in (1));
 alter table t1 rebuild partition;
-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 '' at line 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 '' at line 1
 drop table t1;
 create table t1 (a int)
 partition by list (a)
@@ -1434,7 +1434,7 @@ create table t1 (a int)
 partition by list (a)
 (partition p0 values in (1));
 alter table t1 rebuild partition;
-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 '' at line 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 '' at line 1
 drop table t1;
 create table t2 (s1 int not null auto_increment, primary key (s1)) partition by list (s1) (partition p1 values in (1),partition p2 values in (2),partition p3 values in (3),partition p4 values in (4));
 insert into t2 values (null),(null),(null);
@@ -1999,9 +1999,9 @@ PARTITION p1 VALUES LESS THAN (10),
 PARTITION p2 VALUES LESS THAN (20)
 );
 ALTER TABLE t1 OPTIMIZE PARTITION p1 EXTENDED;
-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 'EXTENDED' at line 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 'EXTENDED' at line 1
 ALTER TABLE t1 ANALYZE PARTITION p1 EXTENDED;
-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 'EXTENDED' at line 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 'EXTENDED' at line 1
 ALTER TABLE t1 ANALYZE PARTITION p1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK