diff options
| author | Rasmus Johansson <razze@iki.fi> | 2020-04-08 06:09:42 +0000 |
|---|---|---|
| committer | Rasmus Johansson <razze@iki.fi> | 2020-04-08 06:09:42 +0000 |
| commit | 9075973dbf2ef69e95d427e3a979be23435692e3 (patch) | |
| tree | 301bcba2da00973ed5df1814e032c139630166b1 /mysql-test/suite/rpl | |
| parent | 0eab87cef26eaac2cff1942e32b3c8c2a8bedf12 (diff) | |
| download | mariadb-git-9075973dbf2ef69e95d427e3a979be23435692e3.tar.gz | |
MDEV-17812 Use MariaDB in error messages instead of MySQL
Changed wording in error messages from MySQL to MariaDB. In
cases where the word server could be used instead it was done.
Tests that have these errors recorded were updated.
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_binlog_rollback_cleanup.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_dual_pos_advance.result | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_rollback_cleanup.result b/mysql-test/suite/rpl/r/rpl_binlog_rollback_cleanup.result index a677cbfecf6..90446776e5b 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_rollback_cleanup.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_rollback_cleanup.result @@ -3,7 +3,7 @@ include/master-slave.inc connection master; SET GLOBAL max_binlog_cache_size = 65536; CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=INNODB; -ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again +ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE; DROP TABLE t1; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result b/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result index 676d74b9478..a9243d23bf6 100644 --- a/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result +++ b/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result @@ -20,7 +20,7 @@ insert into t3 values(4); connection server_1; start slave until master_log_file="MASTER_LOG_FILE",master_log_pos=MASTER_LOG_POS; Warnings: -Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart +Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mariadbd restart include/wait_for_slave_sql_to_stop.inc show tables; Tables_in_test @@ -28,14 +28,14 @@ t1 t2 start slave until master_log_file="MASTER_LOG_FILE",master_log_pos=MASTER_LOG_POS; Warnings: -Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart +Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mariadbd restart include/wait_for_slave_sql_to_stop.inc select * from t3; n 1 start slave until master_log_file="MASTER_LOG_FILE",master_log_pos=MASTER_LOG_POS; Warnings: -Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart +Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mariadbd restart include/wait_for_slave_sql_to_stop.inc select * from t3; n |