MDEV-22189: Change error messages inside code to have mariadb instead ofbb-10.6-MDEV-22189

mysql

Fix: Changed error messages, rerecorded results and changed other relevant
files.

71 files changed, 228 insertions, 228 deletions

diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop
index 19229a57a82..75e8a682811 100644
--- a/debian/additions/innotop/innotop
+++ b/debian/additions/innotop/innotop
@@ -987,12 +987,12 @@ sub parse_tx_text {
    # Parsing the line that begins 'MySQL thread id' is complicated.  The only
    # thing always in the line is the thread and query id.  See function
    # innobase_mysql_print_thd in InnoDB source file sql/ha_innodb.cc.
-   my ( $thread_line ) = $txn =~ m/^(MySQL thread id .*)$/m;
+   my ( $thread_line ) = $txn =~ m/^((?:MariaDB|MySQL) thread id .*)$/m;
    my ( $mysql_thread_id, $query_id, $hostname, $ip, $user, $query_status );
 
    if ( $thread_line ) {
       # These parts can always be gotten.
-      ( $mysql_thread_id, $query_id ) = $thread_line =~ m/^MySQL thread id $d, .*?query id $d/m;
+      ( $mysql_thread_id, $query_id ) = $thread_line =~ m/^(?:MariaDB|MySQL) thread id $d, .*?query id $d/m;
 
       # If it's a master/slave thread, "Has (read|sent) all" may be the thread's
       # proc_info.  In these cases, there won't be any host/ip/user info
@@ -4144,15 +4144,15 @@ my $innodb_parser = InnoDBParser->new;
 
 my $nonfatal_errs = join('|',
    'Access denied for user',
-   'Unknown MySQL server host',
+   'Unknown MariaDB server host',
    'Unknown database',
-   'Can\'t connect to local MySQL server through socket',
-   'Can\'t connect to MySQL server on',
+   'Can\'t connect to local MariaDB server through socket',
+   'Can\'t connect to MariaDB server on',
    'MySQL server has gone away',
    'Cannot call SHOW INNODB STATUS',
    'Access denied',
    'AutoCommit',
-   'Lost connection to MySQL server',
+   'Lost connection to MariaDB server',
    'Too many connections',
 );
 
@@ -7692,7 +7692,7 @@ sub get_driver_status {
 sub get_new_db_connection {
    my ( $connection, $destroy ) = @_;
    if ( $file ) {
-      die "You can't connect to a MySQL server while monitoring a file.  This is probably a bug.";
+      die "You can't connect to a MariaDB server while monitoring a file.  This is probably a bug.";
    }
 
    my $dsn = $connections{$connection}
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc
index b7efd61f182..2b3e24532e2 100644
--- a/extra/mariabackup/backup_mysql.cc
+++ b/extra/mariabackup/backup_mysql.cc
@@ -103,7 +103,7 @@ xb_mysql_connect()
 	sprintf(mysql_port_str, "%d", opt_port);
 
 	if (connection == NULL) {
-		msg("Failed to init MySQL struct: %s.",
+		msg("Failed to init MariaDB struct: %s.",
 			mysql_error(connection));
 		return(NULL);
 	}
@@ -119,7 +119,7 @@ xb_mysql_connect()
 	mysql_options(connection, MYSQL_OPT_PROTOCOL, &opt_protocol);
 	mysql_options(connection,MYSQL_SET_CHARSET_NAME, "utf8");
 
-	msg("Connecting to MySQL server host: %s, user: %s, password: %s, "
+	msg("Connecting to MariaDB server host: %s, user: %s, password: %s, "
 	       "port: %s, socket: %s", opt_host ? opt_host : "localhost",
 	       opt_user ? opt_user : "not set",
 	       opt_password ? "set" : "not set",
@@ -146,7 +146,7 @@ xb_mysql_connect()
 				opt_password,
 				"" /*database*/, opt_port,
 				opt_socket, 0)) {
-		msg("Failed to connect to MySQL server: %s.", mysql_error(connection));
+		msg("Failed to connect to MariaDB server: %s.", mysql_error(connection));
 		mysql_close(connection);
 		return(NULL);
 	}
@@ -454,7 +454,7 @@ bool get_mysql_vars(MYSQL *connection)
     }
     if (!directory_exists(datadir_var, false))
     {
-      msg("Warning: MySQL variable 'datadir' points to "
+      msg("Warning: MariaDB variable 'datadir' points to "
           "nonexistent directory '%s'",
           datadir_var);
     }
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 5fbf9fd9892..a271cff51cb 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -3473,7 +3473,7 @@ next_datadir_item:
 
 	if (0 != os_file_closedir(dir)) {
 		fprintf(stderr,
-			"InnoDB: Error: could not close MySQL datadir\n");
+			"InnoDB: Error: could not close MariaDB datadir\n");
 
 		return(DB_ERROR);
 	}
diff --git a/libmariadb b/libmariadb
-Subproject b6f8883d9687936a50a7ed79bd9e5af2340efcc
+Subproject b57ccee40affa93bb488376be495eda2c8c6e77
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index 9a17b9b4f09..cc10f2a4fb9 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -512,7 +512,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename)
     if (my_net_write(net, (uchar*) buf, readcount))
     {
       DBUG_PRINT("error",
-		 ("Lost connection to MySQL server during LOAD DATA of local file"));
+		 ("Lost connection to MariaDB server during LOAD DATA of local file"));
       set_mysql_error(mysql, CR_SERVER_LOST, unknown_sqlstate);
       goto err;
     }
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index 577d2a78b47..0584bb934e2 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -141,7 +141,7 @@ INSERT INTO global_suppressions VALUES
  ("You have an error in your SQL syntax"),
  ("deprecated"),
  ("description of time zone"),
- ("equal MySQL server ids"),
+ ("equal MariaDB server ids"),
  ("error .*connecting to master"),
  ("error reading log entry"),
  ("lower_case_table_names is set"),
@@ -176,7 +176,7 @@ INSERT INTO global_suppressions VALUES
  ("Restore: The grant .* was skipped because the user does not exist"),
  ("The path specified for the variable .* is not a directory or cannot be written:"),
  ("Master server does not support or not configured semi-sync replication, fallback to asynchronous"),
- (": The MySQL server is running with the --secure-backup-file-priv option so it cannot execute this statement"),
+ (": The MariaDB server is running with the --secure-backup-file-priv option so it cannot execute this statement"),
  ("Slave: Unknown table 't1' error.* 1051"),
 
  /* Maria storage engine dependent tests */
diff --git a/mysql-test/main/connect_debug.result b/mysql-test/main/connect_debug.result
index cc3da50ec6b..2adafc2c4a9 100644
--- a/mysql-test/main/connect_debug.result
+++ b/mysql-test/main/connect_debug.result
@@ -11,10 +11,10 @@ drop user bad;
 set global debug_dbug='+d,increase_srv_handshake_scramble_len';
 connect(localhost,root,,test,MASTER_MYPORT,MYSQL_TMP_DIR/mysqld.1.sock);
 connect con1,localhost,root;
-ERROR HY000: received malformed packet
+ERROR HY000: Received malformed packet
 set global debug_dbug=@old_dbug;
 set global debug_dbug='+d,poison_srv_handshake_scramble_len';
 connect(localhost,root,,test,MASTER_MYPORT,MYSQL_TMP_DIR/mysqld.1.sock);
 connect con2,localhost,root;
-ERROR HY000: received malformed packet
+ERROR HY000: Received malformed packet
 set global debug_dbug=@old_dbug;
diff --git a/mysql-test/main/crash_commit_before.result b/mysql-test/main/crash_commit_before.result
index 22d39e1ddbd..55fea1909f0 100644
--- a/mysql-test/main/crash_commit_before.result
+++ b/mysql-test/main/crash_commit_before.result
@@ -3,7 +3,7 @@ START TRANSACTION;
 insert into t1 values(9);
 SET GLOBAL debug_dbug="d,crash_commit_before";
 COMMIT;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/main/delayed.result b/mysql-test/main/delayed.result
index ec36e3af46d..55f5ff6eb28 100644
--- a/mysql-test/main/delayed.result
+++ b/mysql-test/main/delayed.result
@@ -494,7 +494,7 @@ create table t1 (a int, b int) engine=myisam;
 insert into t1 values (1,1);
 SET debug_dbug="d,crash_shutdown";
 shutdown;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 call mtr.add_suppression(" marked as crashed and should be repaired");
 call mtr.add_suppression("Checking table");
 insert delayed into t1 values (2,2);
diff --git a/mysql-test/main/grant4.result b/mysql-test/main/grant4.result
index 981bbdeddf5..74f9c8e61ab 100644
--- a/mysql-test/main/grant4.result
+++ b/mysql-test/main/grant4.result
@@ -166,7 +166,7 @@ End of 5.5 tests
 # are insufficient are discovered.
 #
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*mysqltest_u1 Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*mysqltest_u1 Checking table");
 drop database if exists mysqltest_db1;
 create database mysqltest_db1;
 # Create tables which we are going to CHECK/REPAIR.
diff --git a/mysql-test/main/grant4.test b/mysql-test/main/grant4.test
index a63bd158a0d..65e8f78b467 100644
--- a/mysql-test/main/grant4.test
+++ b/mysql-test/main/grant4.test
@@ -191,7 +191,7 @@ source include/switch_to_mysql_global_priv.inc;
 --echo # are insufficient are discovered.
 --echo #
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*mysqltest_u1 Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*mysqltest_u1 Checking table");
 --disable_warnings
 drop database if exists mysqltest_db1;
 --enable_warnings
diff --git a/mysql-test/main/myisam.result b/mysql-test/main/myisam.result
index 0f68171c6c2..d29a52f1bb6 100644
--- a/mysql-test/main/myisam.result
+++ b/mysql-test/main/myisam.result
@@ -2630,7 +2630,7 @@ End of 5.1 tests
 #           even if myisam-recover is OFF
 #
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*root Checking table");
 call mtr.add_suppression(" '\..test.t1'");
 # Test that we can exchange a crashed partition with a table
 SELECT @@global.myisam_recover_options;
diff --git a/mysql-test/main/myisam.test b/mysql-test/main/myisam.test
index 5ed63f50f49..2ae4da671e6 100644
--- a/mysql-test/main/myisam.test
+++ b/mysql-test/main/myisam.test
@@ -1758,7 +1758,7 @@ DROP TABLE t1;
 --echo #
 
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*root Checking table");
 call mtr.add_suppression(" '\..test.t1'");
 
 let $MYSQLD_DATADIR = `SELECT @@datadir`;
diff --git a/mysql-test/main/myisam_crash_before_flush_keys.result b/mysql-test/main/myisam_crash_before_flush_keys.result
index 7d929ffb644..3d8e3842672 100644
--- a/mysql-test/main/myisam_crash_before_flush_keys.result
+++ b/mysql-test/main/myisam_crash_before_flush_keys.result
@@ -4,7 +4,7 @@
 # Don't test this under valgrind, memory leaks will occur
 # Binary must be compiled with debug for crash to occur
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*root Checking table");
 flush tables;
 SET GLOBAL delay_key_write=ALL;
 CREATE TABLE t1(a INT, 
@@ -17,7 +17,7 @@ SET SESSION debug_dbug="d,crash_before_flush_keys";
 # Write file to make mysql-test-run.pl expect crash
 # Run the crashing query
 FLUSH TABLE t1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # Write file to make mysql-test-run.pl start the server 
 # Turn on reconnect
 # Call script that will poll the server waiting for
diff --git a/mysql-test/main/myisam_crash_before_flush_keys.test b/mysql-test/main/myisam_crash_before_flush_keys.test
index 8df81f73ec0..791e43b0c9b 100644
--- a/mysql-test/main/myisam_crash_before_flush_keys.test
+++ b/mysql-test/main/myisam_crash_before_flush_keys.test
@@ -9,7 +9,7 @@
 --source include/have_debug.inc
 
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*root Checking table");
 flush tables;
 # Avoid CrashReporter popup on Mac
 --source include/not_crashrep.inc
diff --git a/mysql-test/main/myisam_recover.result b/mysql-test/main/myisam_recover.result
index da96682186c..1f147af13c8 100644
--- a/mysql-test/main/myisam_recover.result
+++ b/mysql-test/main/myisam_recover.result
@@ -17,7 +17,7 @@ connection con1;
 # Minimal values.
 #
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*root Checking table");
 call mtr.add_suppression(" '\..test.t1'");
 set @save_table_open_cache=@@table_open_cache;
 set global table_open_cache=256;
diff --git a/mysql-test/main/myisam_recover.test b/mysql-test/main/myisam_recover.test
index 9056b219148..6fe250197d5 100644
--- a/mysql-test/main/myisam_recover.test
+++ b/mysql-test/main/myisam_recover.test
@@ -22,7 +22,7 @@ connection con1;
 --echo #
 
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*root Checking table");
 call mtr.add_suppression(" '\..test.t1'");
 
 set @save_table_open_cache=@@table_open_cache;
diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result
index ec2760ce8a7..ef5332e2142 100644
--- a/mysql-test/main/mysql.result
+++ b/mysql-test/main/mysql.result
@@ -172,14 +172,14 @@ ERROR 1049 (42000) at line 1: Unknown database 'invalid'
 ERROR 1049 (42000) at line 1: Unknown database 'invalid'
 Test connect with dbname + hostname
 Test connect with dbname + _invalid_ hostname
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
+ERROR 2005 (HY000) at line 1: Unknown server host 'invalid_hostname' (errno)
+ERROR 2005 (HY000) at line 1: Unknown server host 'invalid_hostname' (errno)
 The commands reported in the bug report
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
+ERROR 2005 (HY000) at line 1: Unknown server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
 Too long dbname
 ERROR 1102 (42000) at line 1: Incorrect database name 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx...'
 Too long hostname
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
+ERROR 2005 (HY000) at line 1: Unknown server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
 1
 1
 ERROR at line 1: DELIMITER cannot contain a backslash character
@@ -208,7 +208,7 @@ COUNT (*)
 1
 COUNT (*)
 1
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
+ERROR 2005 (HY000) at line 1: Unknown server host 'invalid_hostname' (errno)
 End of 5.0 tests
 WARNING: --server-arg option not supported in this configuration.
 *************************** 1. row ***************************
diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result
index a85068df421..3a4ac9089a2 100644
--- a/mysql-test/main/mysql_upgrade.result
+++ b/mysql-test/main/mysql_upgrade.result
@@ -455,7 +455,7 @@ Version check failed. Got the following error when calling the 'mysql' command l
 ERROR 1045 (28000): Access denied for user 'mysqltest1'@'localhost' (using password: YES)
 FATAL ERROR: Upgrade failed
 Run mysql_upgrade with a non existing server socket
-mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
+mysqlcheck: Got error: 2005: Unknown server host 'not_existing_host' (errno) when trying to connect
 FATAL ERROR: Upgrade failed
 set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
 Phase 1/7: Checking and upgrading mysql database
diff --git a/mysql-test/main/partition_innodb.test b/mysql-test/main/partition_innodb.test
index f3bbbb5cb63..26c7c0783f3 100644
--- a/mysql-test/main/partition_innodb.test
+++ b/mysql-test/main/partition_innodb.test
@@ -330,7 +330,7 @@ UPDATE t1 SET DATA = data*2 WHERE id = 3;
 # PERFORMANCE-VERSION
 # grouping/referencing in replace_regex is very slow on long strings,
 # removing all before/after the interesting row before grouping/referencing
-#--replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MySQL thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+) lock struct\(s\), heap size [0-9]+, ([0-9]+) row lock\(s\).*/\1 lock struct(s) \2 row lock(s)/
+#--replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MariaDB thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+) lock struct\(s\), heap size [0-9]+, ([0-9]+) row lock\(s\).*/\1 lock struct(s) \2 row lock(s)/
 #SHOW ENGINE InnoDB STATUS;
 
 UPDATE t1 SET data = data*2 WHERE data = 2;
@@ -339,7 +339,7 @@ UPDATE t1 SET data = data*2 WHERE data = 2;
 # PERFORMANCE-VERSION
 # grouping/referencing in replace_regex is very slow on long strings,
 # removing all before/after the interesting row before grouping/referencing
-#--replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MySQL thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+ lock struct\(s\)), heap size [0-9]+, ([0-9]+ row lock\(s\)).*/\1 \2/
+#--replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MariaDB thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+ lock struct\(s\)), heap size [0-9]+, ([0-9]+ row lock\(s\)).*/\1 \2/
 #SHOW ENGINE InnoDB STATUS;
 
 SET @@session.tx_isolation = @old_tx_isolation;
diff --git a/mysql-test/main/ssl_crl.result b/mysql-test/main/ssl_crl.result
index 598774bd772..3ada7cec010 100644
--- a/mysql-test/main/ssl_crl.result
+++ b/mysql-test/main/ssl_crl.result
@@ -2,4 +2,4 @@
 Variable_name	Value
 Ssl_version	TLS_VERSION
 # try logging in with a certificate in the server's --ssl-crl : should fail
-ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked
+ERROR 2013 (HY000): Lost connection to server at 'reading authorization packet', system error: 0
diff --git a/mysql-test/main/ssl_crl.test b/mysql-test/main/ssl_crl.test
index e79f8ff32c2..5d05bdec256 100644
--- a/mysql-test/main/ssl_crl.test
+++ b/mysql-test/main/ssl_crl.test
@@ -8,6 +8,6 @@
 
 --echo # try logging in with a certificate in the server's --ssl-crl : should fail
 # OpenSSL 1.1.1a correctly rejects the certificate, but the error message is different
---replace_regex /ERROR 2013 \(HY000\): Lost connection to MySQL server at '.*', system error: [0-9]+/ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked/
+--replace_regex /ERROR 2013 \(HY000\): Lost connection to MariaDB server at '.*', system error: [0-9]+/ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked/
 --error 1
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1
diff --git a/mysql-test/main/ssl_timeout.result b/mysql-test/main/ssl_timeout.result
index 3c94a9927da..e0d1dbed69f 100644
--- a/mysql-test/main/ssl_timeout.result
+++ b/mysql-test/main/ssl_timeout.result
@@ -5,6 +5,6 @@ SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS
 have_ssl
 1
 SELECT SLEEP(600);
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 connection default;
 disconnect ssl_con;
diff --git a/mysql-test/suite/binlog/include/binlog_index.inc b/mysql-test/suite/binlog/include/binlog_index.inc
index d73091d59ab..da6cac18e30 100644
--- a/mysql-test/suite/binlog/include/binlog_index.inc
+++ b/mysql-test/suite/binlog/include/binlog_index.inc
@@ -17,7 +17,7 @@ source include/have_debug.inc;
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
 call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file');
-call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.');
+call mtr.add_suppression('Turning logging off for the whole duration of the MariaDB server process.');
 call mtr.add_suppression('Could not use .*');
 call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
 flush tables;
diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result
index f643c5a9c35..9dfda71f9a7 100644
--- a/mysql-test/suite/binlog/r/binlog_index.result
+++ b/mysql-test/suite/binlog/r/binlog_index.result
@@ -1,7 +1,7 @@
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
 call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file');
-call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.');
+call mtr.add_suppression('Turning logging off for the whole duration of the MariaDB server process.');
 call mtr.add_suppression('Could not use .*');
 call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
 flush tables;
@@ -50,7 +50,7 @@ reset master;
 flush logs;
 SET SESSION debug_dbug="+d,crash_purge_before_update_index";
 purge binary logs TO 'master-bin.000002';
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -62,7 +62,7 @@ master-bin.000003
 flush logs;
 SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index";
 purge binary logs TO 'master-bin.000004';
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -73,7 +73,7 @@ master-bin.000005
 flush logs;
 SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index";
 purge binary logs TO 'master-bin.000006';
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -83,7 +83,7 @@ master-bin.000007
 # crash_create_non_critical_before_update_index
 SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index";
 flush logs;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -94,7 +94,7 @@ master-bin.000008
 # crash_create_critical_before_update_index
 SET SESSION debug_dbug="+d,crash_create_critical_before_update_index";
 flush logs;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -106,7 +106,7 @@ master-bin.000009
 # crash_create_after_update_index
 SET SESSION debug_dbug="+d,crash_create_after_update_index";
 flush logs;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
diff --git a/mysql-test/suite/binlog_encryption/binlog_index.result b/mysql-test/suite/binlog_encryption/binlog_index.result
index f643c5a9c35..9dfda71f9a7 100644
--- a/mysql-test/suite/binlog_encryption/binlog_index.result
+++ b/mysql-test/suite/binlog_encryption/binlog_index.result
@@ -1,7 +1,7 @@
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
 call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file');
-call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.');
+call mtr.add_suppression('Turning logging off for the whole duration of the MariaDB server process.');
 call mtr.add_suppression('Could not use .*');
 call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
 flush tables;
@@ -50,7 +50,7 @@ reset master;
 flush logs;
 SET SESSION debug_dbug="+d,crash_purge_before_update_index";
 purge binary logs TO 'master-bin.000002';
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -62,7 +62,7 @@ master-bin.000003
 flush logs;
 SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index";
 purge binary logs TO 'master-bin.000004';
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -73,7 +73,7 @@ master-bin.000005
 flush logs;
 SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index";
 purge binary logs TO 'master-bin.000006';
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -83,7 +83,7 @@ master-bin.000007
 # crash_create_non_critical_before_update_index
 SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index";
 flush logs;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -94,7 +94,7 @@ master-bin.000008
 # crash_create_critical_before_update_index
 SET SESSION debug_dbug="+d,crash_create_critical_before_update_index";
 flush logs;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -106,7 +106,7 @@ master-bin.000009
 # crash_create_after_update_index
 SET SESSION debug_dbug="+d,crash_create_after_update_index";
 flush logs;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
diff --git a/mysql-test/suite/binlog_encryption/rpl_sync.result b/mysql-test/suite/binlog_encryption/rpl_sync.result
index 1240c446164..5fa3a07a4e7 100644
--- a/mysql-test/suite/binlog_encryption/rpl_sync.result
+++ b/mysql-test/suite/binlog_encryption/rpl_sync.result
@@ -22,7 +22,7 @@ connection slave;
 include/stop_slave_io.inc
 SET SESSION debug_dbug="d,crash_before_rotate_relaylog";
 FLUSH LOGS;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 include/rpl_reconnect.inc
 =====Dumping and comparing tables=======;
 include/start_slave.inc
@@ -40,7 +40,7 @@ insert into t1(a) values(9);
 connection slave;
 SET SESSION debug_dbug="d,crash_before_rotate_relaylog";
 FLUSH LOGS;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 include/rpl_reconnect.inc
 =====Dumping and comparing tables=======;
 include/start_slave.inc
diff --git a/mysql-test/suite/galera/include/galera_sst_restore.inc b/mysql-test/suite/galera/include/galera_sst_restore.inc
index 83d07f086d1..3248c06c509 100644
--- a/mysql-test/suite/galera/include/galera_sst_restore.inc
+++ b/mysql-test/suite/galera/include/galera_sst_restore.inc
@@ -4,7 +4,7 @@
 #
 
 --connection node_1
-CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
+CALL mtr.add_suppression("Slave SQL: Error 'The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
 
 --disable_query_log
 --eval SET GLOBAL wsrep_sst_auth = '$wsrep_sst_auth_orig';
@@ -14,7 +14,7 @@ CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the
 DROP USER sst;
 
 --connection node_2
-CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
+CALL mtr.add_suppression("Slave SQL: Error 'The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
 CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found");
 CALL mtr.add_suppression("Can't open and lock time zone table");
 CALL mtr.add_suppression("Can't open and lock privilege tables");
diff --git a/mysql-test/suite/innodb/r/alter_crash.result b/mysql-test/suite/innodb/r/alter_crash.result
index bf593c6acca..8cfeb7093ca 100644
--- a/mysql-test/suite/innodb/r/alter_crash.result
+++ b/mysql-test/suite/innodb/r/alter_crash.result
@@ -46,7 +46,7 @@ CREATE TABLE t1 (f1 INT NOT NULL, f2 INT NOT NULL) ENGINE=innodb;
 INSERT INTO t1 VALUES (1,2),(3,4);
 SET DEBUG_DBUG='+d,innodb_alter_commit_crash_after_commit';
 ALTER TABLE t1 ADD PRIMARY KEY (f2, f1);
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # Restart mysqld after the crash and reconnect.
 # restart
 SELECT * FROM information_schema.innodb_sys_tables
@@ -86,7 +86,7 @@ CREATE TABLE t2 (f1 int not null, f2 int not null) ENGINE=InnoDB;
 INSERT INTO t2 VALUES (1,2),(3,4);
 SET DEBUG_DBUG='+d,innodb_alter_commit_crash_before_commit';
 ALTER TABLE t2 ADD PRIMARY KEY (f2, f1);
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # Startup the server after the crash
 # restart
 SELECT * FROM information_schema.innodb_sys_tables
@@ -125,7 +125,7 @@ ENGINE=InnoDB;
 INSERT INTO t1 SET a=1,c=2;
 SET DEBUG_DBUG='+d,innodb_alter_commit_crash_after_commit';
 ALTER TABLE t1 ADD INDEX (b), CHANGE c d int, ALGORITHM=INPLACE;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # Restart mysqld after the crash and reconnect.
 # restart
 SELECT * FROM information_schema.innodb_sys_tables
diff --git a/mysql-test/suite/innodb/r/innodb-alter-tempfile.result b/mysql-test/suite/innodb/r/innodb-alter-tempfile.result
index cfc99650db6..9c698d9dab4 100644
--- a/mysql-test/suite/innodb/r/innodb-alter-tempfile.result
+++ b/mysql-test/suite/innodb/r/innodb-alter-tempfile.result
@@ -7,7 +7,7 @@
 CREATE TABLE t1 (f1 INT NOT NULL, f2 INT NOT NULL) ENGINE=innodb;
 SET debug_dbug='+d,innodb_alter_commit_crash_before_commit';
 ALTER TABLE t1 ADD PRIMARY KEY (f2, f1);
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # restart
 show create table t1;
 Table	Create Table
diff --git a/mysql-test/suite/innodb/r/innodb-blob.result b/mysql-test/suite/innodb/r/innodb-blob.result
index fdfbfe3e683..8173d30e92c 100644
--- a/mysql-test/suite/innodb/r/innodb-blob.result
+++ b/mysql-test/suite/innodb/r/innodb-blob.result
@@ -47,7 +47,7 @@ INSERT INTO t2 VALUES (42);
 disconnect con1;
 disconnect con2;
 connection default;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -107,7 +107,7 @@ connection con2;
 # restart
 disconnect con2;
 connection default;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 CHECK TABLE t1,t2,t3;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -139,7 +139,7 @@ UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2
 # restart
 disconnect con2;
 connection default;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 CHECK TABLE t1,t2,t3;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result
index 42d75726615..63313d7d7eb 100644
--- a/mysql-test/suite/innodb/r/innodb-table-online.result
+++ b/mysql-test/suite/innodb/r/innodb-table-online.result
@@ -1,6 +1,6 @@
 call mtr.add_suppression("InnoDB: Warning: Small buffer pool size");
 call mtr.add_suppression("InnoDB: Error: table 'test/t1'");
-call mtr.add_suppression("MySQL is trying to open a table handle but the .ibd file for");
+call mtr.add_suppression("MariaDB is trying to open a table handle but the .ibd file for");
 SET @global_innodb_file_per_table_orig = @@global.innodb_file_per_table;
 SET GLOBAL innodb_file_per_table = on;
 CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT NOT NULL, c3 CHAR(255) NOT NULL)
diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test
index 86aa34f8c35..d799221cb13 100644
--- a/mysql-test/suite/innodb/t/innodb-table-online.test
+++ b/mysql-test/suite/innodb/t/innodb-table-online.test
@@ -9,7 +9,7 @@ SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl
 call mtr.add_suppression("InnoDB: Warning: Small buffer pool size");
 # these will be triggered by DISCARD TABLESPACE
 call mtr.add_suppression("InnoDB: Error: table 'test/t1'");
-call mtr.add_suppression("MySQL is trying to open a table handle but the .ibd file for");
+call mtr.add_suppression("MariaDB is trying to open a table handle but the .ibd file for");
 
 # DISCARD TABLESPACE needs file-per-table
 SET @global_innodb_file_per_table_orig = @@global.innodb_file_per_table;
diff --git a/mysql-test/suite/innodb/t/sp_temp_table.test b/mysql-test/suite/innodb/t/sp_temp_table.test
index b2883f551b9..f355dfd1717 100644
--- a/mysql-test/suite/innodb/t/sp_temp_table.test
+++ b/mysql-test/suite/innodb/t/sp_temp_table.test
@@ -6,7 +6,7 @@
 --echo # CALLED FROM A FUNCTION
 --echo #
 
-call mtr.add_suppression("MySQL is trying to drop table");
+call mtr.add_suppression("MariaDB is trying to drop table");
 
 DELIMITER $$;
 CREATE PROCEDURE cachedata(
diff --git a/mysql-test/suite/innodb_fts/r/sync.result b/mysql-test/suite/innodb_fts/r/sync.result
index 5b8e4810028..92cb3a748e4 100644
--- a/mysql-test/suite/innodb_fts/r/sync.result
+++ b/mysql-test/suite/innodb_fts/r/sync.result
@@ -97,7 +97,7 @@ FULLTEXT(title)
 INSERT INTO t1(title) VALUES('database');
 SET debug_dbug = '+d,fts_instrument_sync_debug,fts_write_node_crash';
 INSERT INTO t1(title) VALUES('mysql');
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # restart
 After restart
 SELECT title FROM t1 WHERE MATCH(title) AGAINST ('mysql database');
diff --git a/mysql-test/suite/innodb_gis/r/alter_spatial_index.result b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result
index 87485401794..ada44f2062b 100644
--- a/mysql-test/suite/innodb_gis/r/alter_spatial_index.result
+++ b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result
@@ -1,4 +1,4 @@
-CALL mtr.add_suppression("but MySQL is asking statistics for 2 columns. Have you mixed");
+CALL mtr.add_suppression("but MariaDB is asking statistics for 2 columns. Have you mixed");
 CREATE TABLE tab(c1 int NOT NULL PRIMARY KEY,c2 POINT NOT NULL,
 c3 LINESTRING NOT NULL,c4 POLYGON NOT NULL,c5 GEOMETRY NOT NULL)
 ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb_gis/r/rollback.result b/mysql-test/suite/innodb_gis/r/rollback.result
index 8688690b66a..0d2b9c7cf2c 100644
--- a/mysql-test/suite/innodb_gis/r/rollback.result
+++ b/mysql-test/suite/innodb_gis/r/rollback.result
@@ -411,6 +411,6 @@ set session debug="+d,row_mysql_crash_if_error";
 Warnings:
 Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 update t1 set a=point(5,5), b=point(5,5), c=5 where i < 3;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 insert into t1 values(5, point(5,5), point(5,5), 5);
 drop table t1;
diff --git a/mysql-test/suite/innodb_gis/t/alter_spatial_index.test b/mysql-test/suite/innodb_gis/t/alter_spatial_index.test
index b7eac432fcc..9c3835a4a75 100644
--- a/mysql-test/suite/innodb_gis/t/alter_spatial_index.test
+++ b/mysql-test/suite/innodb_gis/t/alter_spatial_index.test
@@ -15,7 +15,7 @@
 # Check Foreign Key constraint on Geometry column
 # ******************************************************************
 
-CALL mtr.add_suppression("but MySQL is asking statistics for 2 columns. Have you mixed");
+CALL mtr.add_suppression("but MariaDB is asking statistics for 2 columns. Have you mixed");
 
 --source include/have_innodb.inc
 --source include/have_geometry.inc
diff --git a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
index fccee685caf..ca1a989f253 100644
--- a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
+++ b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
@@ -29,12 +29,12 @@ SET SESSION debug_dbug="+d,ib_import_before_commit_crash";
 SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table `t1`
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 SET SESSION debug_dbug="+d,ib_import_before_checkpoint_crash";
 SELECT COUNT(*) FROM t1;
 ERROR HY000: Tablespace has been discarded for table `t1`
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 unlink: t1.ibd
 unlink: t1.cfg
 # Restart and reconnect to the server
diff --git a/mysql-test/suite/maria/bulk_insert_crash.result b/mysql-test/suite/maria/bulk_insert_crash.result
index fc28bf325ba..0cf5a474939 100644
--- a/mysql-test/suite/maria/bulk_insert_crash.result
+++ b/mysql-test/suite/maria/bulk_insert_crash.result
@@ -3,7 +3,7 @@ insert into t1 values (1000,1000,1000);
 insert into t1 select seq,seq+100, seq+200 from seq_1_to_10;
 SET GLOBAL debug_dbug="+d,crash_end_bulk_insert";
 REPLACE into t1 select seq+20,seq+95, seq + 300 from seq_1_to_10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
diff --git a/mysql-test/suite/maria/maria-gis-recovery.result b/mysql-test/suite/maria/maria-gis-recovery.result
index f84a01fb854..d95b468bbf6 100644
--- a/mysql-test/suite/maria/maria-gis-recovery.result
+++ b/mysql-test/suite/maria/maria-gis-recovery.result
@@ -28,7 +28,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * copied t1 back for feeding_recovery
 * recovery happens
 check table t1 extended;
@@ -59,7 +59,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * copied t1 back for feeding_recovery
 * recovery happens
 check table t1 extended;
diff --git a/mysql-test/suite/maria/maria-recovery-bitmap.result b/mysql-test/suite/maria/maria-recovery-bitmap.result
index c6d0e2cb4e1..78ae6944aa8 100644
--- a/mysql-test/suite/maria/maria-recovery-bitmap.result
+++ b/mysql-test/suite/maria/maria-recovery-bitmap.result
@@ -25,7 +25,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -47,7 +47,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_bitmap,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
diff --git a/mysql-test/suite/maria/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/maria-recovery-rtree-ft.result
index 3a2716f29d9..329cc71c6e9 100644
--- a/mysql-test/suite/maria/maria-recovery-rtree-ft.result
+++ b/mysql-test/suite/maria/maria-recovery-rtree-ft.result
@@ -38,7 +38,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * copied t2 back for feeding_recovery
 * copied t1 back for feeding_recovery
 * recovery happens
@@ -68,7 +68,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t2 extended;
 Table	Op	Msg_type	Msg_text
@@ -95,7 +95,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t2 extended;
 Table	Op	Msg_type	Msg_text
@@ -122,7 +122,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t2 extended;
 Table	Op	Msg_type	Msg_text
@@ -149,7 +149,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t2 extended;
 Table	Op	Msg_type	Msg_text
@@ -169,7 +169,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t2 extended;
 Table	Op	Msg_type	Msg_text
diff --git a/mysql-test/suite/maria/maria-recovery.result b/mysql-test/suite/maria/maria-recovery.result
index 915dc53b460..9aa9213d9bd 100644
--- a/mysql-test/suite/maria/maria-recovery.result
+++ b/mysql-test/suite/maria/maria-recovery.result
@@ -22,7 +22,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * copied t1 back for feeding_recovery
 * recovery happens
 check table t1 extended;
@@ -49,7 +49,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -74,7 +74,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -100,7 +100,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -127,7 +127,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -171,7 +171,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * copied t1 back for feeding_recovery
 * recovery happens
 check table t1 extended;
@@ -210,7 +210,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * copied t1 back for feeding_recovery
 * recovery happens
 check table t1 extended;
@@ -242,7 +242,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * copied t1 back for feeding_recovery
 * recovery happens
 check table t1 extended;
@@ -272,7 +272,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -316,7 +316,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 connection default;
 use mysqltest;
diff --git a/mysql-test/suite/maria/maria-recovery2.result b/mysql-test/suite/maria/maria-recovery2.result
index dee99339a87..4240e76f141 100644
--- a/mysql-test/suite/maria/maria-recovery2.result
+++ b/mysql-test/suite/maria/maria-recovery2.result
@@ -25,7 +25,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -60,7 +60,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -93,7 +93,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -134,7 +134,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -162,7 +162,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash_sort_index";
 * crashing mysqld intentionally
 optimize table t_corrupted1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t_corrupted1 extended;
 Table	Op	Msg_type	Msg_text
diff --git a/mysql-test/suite/maria/maria-recovery3.result b/mysql-test/suite/maria/maria-recovery3.result
index 9d25cd13b90..190a2993e5a 100644
--- a/mysql-test/suite/maria/maria-recovery3.result
+++ b/mysql-test/suite/maria/maria-recovery3.result
@@ -25,7 +25,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -67,7 +67,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * copied t1 back for feeding_recovery
 * recovery happens
 check table t1 extended;
@@ -96,7 +96,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash_create_table";
 * crashing mysqld intentionally
 truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
@@ -122,7 +122,7 @@ connection admin;
 SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 * recovery happens
 check table t1 extended;
 Table	Op	Msg_type	Msg_text
diff --git a/mysql-test/suite/parts/r/debug_innodb_crash.result b/mysql-test/suite/parts/r/debug_innodb_crash.result
index 68195967b5b..fc265b4957d 100644
--- a/mysql-test/suite/parts/r/debug_innodb_crash.result
+++ b/mysql-test/suite/parts/r/debug_innodb_crash.result
@@ -1,6 +1,6 @@
 call mtr.add_suppression("InnoDB: Warning: allocated tablespace .*, old maximum was");
 call mtr.add_suppression("table .* does not exist in the InnoDB internal");
-call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table ");
+call mtr.add_suppression("InnoDB: Warning: MariaDB is trying to drop table ");
 # Test crash recovery in fast_alter_partition_table.
 #
 # Bug#53676: Unexpected errors and possible table corruption on
@@ -46,7 +46,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -114,7 +114,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -184,7 +184,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -254,7 +254,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -324,7 +324,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -395,7 +395,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -466,7 +466,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -537,7 +537,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -610,7 +610,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -681,7 +681,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -753,7 +753,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -820,7 +820,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -889,7 +889,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -958,7 +958,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1021,7 +1021,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1084,7 +1084,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1147,7 +1147,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -1208,7 +1208,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -1268,7 +1268,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -1333,7 +1333,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -1402,7 +1402,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1473,7 +1473,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1544,7 +1544,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1617,7 +1617,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1690,7 +1690,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1763,7 +1763,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1838,7 +1838,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1913,7 +1913,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -1986,7 +1986,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -2059,7 +2059,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -2131,7 +2131,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
diff --git a/mysql-test/suite/parts/r/debug_innodb_fail.result b/mysql-test/suite/parts/r/debug_innodb_fail.result
index 810d2aa9260..3409d162f1c 100644
--- a/mysql-test/suite/parts/r/debug_innodb_fail.result
+++ b/mysql-test/suite/parts/r/debug_innodb_fail.result
@@ -1,6 +1,6 @@
 call mtr.add_suppression("InnoDB: Warning: allocated tablespace .*, old maximum was");
 call mtr.add_suppression("table .* does not exist in the InnoDB internal");
-call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table ");
+call mtr.add_suppression("InnoDB: Warning: MariaDB is trying to drop table ");
 # Test failure recovery in fast_alter_partition_table.
 #
 # Bug#53676: Unexpected errors and possible table corruption on
diff --git a/mysql-test/suite/parts/r/debug_myisam_crash.result b/mysql-test/suite/parts/r/debug_myisam_crash.result
index 5252af12db1..2b0f6973228 100644
--- a/mysql-test/suite/parts/r/debug_myisam_crash.result
+++ b/mysql-test/suite/parts/r/debug_myisam_crash.result
@@ -45,7 +45,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -119,7 +119,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -195,7 +195,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -271,7 +271,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -347,7 +347,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -425,7 +425,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -503,7 +503,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -581,7 +581,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -662,7 +662,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -741,7 +741,7 @@ a	b
 4	Original from partition p0
 ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -821,7 +821,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -894,7 +894,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -969,7 +969,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1044,7 +1044,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1112,7 +1112,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1180,7 +1180,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1248,7 +1248,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -1314,7 +1314,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -1378,7 +1378,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 DROP PARTITION p10;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -1447,7 +1447,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -1522,7 +1522,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1599,7 +1599,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1676,7 +1676,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1757,7 +1757,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1838,7 +1838,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -1919,7 +1919,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -2003,7 +2003,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-shadow-t1.frm
 #sql-shadow-t1.par
@@ -2087,7 +2087,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -2169,7 +2169,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -2251,7 +2251,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -2331,7 +2331,7 @@ a	b
 ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19),
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
diff --git a/mysql-test/suite/parts/r/partition_debug.result b/mysql-test/suite/parts/r/partition_debug.result
index 7c083d826cf..571ab329bc2 100644
--- a/mysql-test/suite/parts/r/partition_debug.result
+++ b/mysql-test/suite/parts/r/partition_debug.result
@@ -76,7 +76,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -191,7 +191,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -306,7 +306,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -421,7 +421,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-exchange.frm
 # State after crash recovery
@@ -527,7 +527,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-exchange.frm
 # State after crash recovery
@@ -633,7 +633,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-exchange.frm
 # State after crash recovery
@@ -739,7 +739,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-exchange.frm
 # State after crash recovery
@@ -845,7 +845,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
@@ -960,7 +960,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.MYD
diff --git a/mysql-test/suite/parts/r/partition_debug_innodb.result b/mysql-test/suite/parts/r/partition_debug_innodb.result
index e2631d0d708..15d670ff416 100644
--- a/mysql-test/suite/parts/r/partition_debug_innodb.result
+++ b/mysql-test/suite/parts/r/partition_debug_innodb.result
@@ -1,6 +1,6 @@
 call mtr.add_suppression("InnoDB: Warning: allocated tablespace .*, old maximum was");
 call mtr.add_suppression("InnoDB: Error: table .* does not exist in the InnoDB internal");
-call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table ");
+call mtr.add_suppression("InnoDB: Warning: MariaDB is trying to drop table ");
 call mtr.add_suppression("table .* does not exist in the InnoDB internal");
 #
 # WL#4445: EXCHANGE PARTITION WITH TABLE
@@ -62,7 +62,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -170,7 +170,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -278,7 +278,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -386,7 +386,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-exchange.frm
 # State after crash recovery
@@ -488,7 +488,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-exchange.frm
 # State after crash recovery
@@ -590,7 +590,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-exchange.ibd
 # State after crash recovery
@@ -692,7 +692,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 #sql-exchange.ibd
 # State after crash recovery
@@ -794,7 +794,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
@@ -902,7 +902,7 @@ a	b
 3	Original from partition p0
 4	Original from partition p0
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 # State after crash (before recovery)
 db.opt
 t1#P#p0.ibd
diff --git a/mysql-test/suite/parts/t/debug_innodb_crash.test b/mysql-test/suite/parts/t/debug_innodb_crash.test
index e06b3c3b254..8b71f4862d4 100644
--- a/mysql-test/suite/parts/t/debug_innodb_crash.test
+++ b/mysql-test/suite/parts/t/debug_innodb_crash.test
@@ -11,7 +11,7 @@ call mtr.add_suppression("InnoDB: Warning: allocated tablespace .*, old maximum
 # If there is a crash or failure between the ddl_log is written and the
 # operation is completed, mysql will try to drop a not yet created partition
 call mtr.add_suppression("table .* does not exist in the InnoDB internal");
-call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table ");
+call mtr.add_suppression("InnoDB: Warning: MariaDB is trying to drop table ");
 
 --let $DATADIR= `SELECT @@datadir;`
 
diff --git a/mysql-test/suite/parts/t/debug_innodb_fail.test b/mysql-test/suite/parts/t/debug_innodb_fail.test
index d0e827a3fc6..a6922f5923d 100644
--- a/mysql-test/suite/parts/t/debug_innodb_fail.test
+++ b/mysql-test/suite/parts/t/debug_innodb_fail.test
@@ -10,7 +10,7 @@ call mtr.add_suppression("InnoDB: Warning: allocated tablespace .*, old maximum
 # If there is a crash or failure between the ddl_log is written and the
 # operation is completed, mysql will try to drop a not yet created partition
 call mtr.add_suppression("table .* does not exist in the InnoDB internal");
-call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table ");
+call mtr.add_suppression("InnoDB: Warning: MariaDB is trying to drop table ");
 
 
 --let $DATADIR= `SELECT @@datadir;`
diff --git a/mysql-test/suite/parts/t/partition_debug_innodb.test b/mysql-test/suite/parts/t/partition_debug_innodb.test
index d34a426a269..1a408cef95d 100644
--- a/mysql-test/suite/parts/t/partition_debug_innodb.test
+++ b/mysql-test/suite/parts/t/partition_debug_innodb.test
@@ -57,7 +57,7 @@ call mtr.add_suppression("InnoDB: Warning: allocated tablespace .*, old maximum
 # If there is a crash or failure between the ddl_log is written and the
 # operation is completed, mysql will try to drop a not yet created partition
 call mtr.add_suppression("InnoDB: Error: table .* does not exist in the InnoDB internal");
-call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table ");
+call mtr.add_suppression("InnoDB: Warning: MariaDB is trying to drop table ");
 call mtr.add_suppression("table .* does not exist in the InnoDB internal");
 
 
diff --git a/mysql-test/suite/parts/t/partition_repair_myisam.test b/mysql-test/suite/parts/t/partition_repair_myisam.test
index a21493ca03d..3f43127a0c8 100644
--- a/mysql-test/suite/parts/t/partition_repair_myisam.test
+++ b/mysql-test/suite/parts/t/partition_repair_myisam.test
@@ -4,7 +4,7 @@
 --disable_query_log
 drop table if exists t1_will_crash;
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
-call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
+call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*root Checking table");
 call mtr.add_suppression("is marked as crashed and should be repaired");
 
 --enable_query_log
diff --git a/mysql-test/suite/plugins/t/processlist.test b/mysql-test/suite/plugins/t/processlist.test
index 39b715b867b..17a51e78141 100644
--- a/mysql-test/suite/plugins/t/processlist.test
+++ b/mysql-test/suite/plugins/t/processlist.test
@@ -13,7 +13,7 @@ let $wait_condition=select state='' from information_schema.processlist where id
 replace_regex /\"/-/; #"
 let s=`show engine innodb status`;
 disable_query_log;
-eval select regexp_replace("$s", '(?s)^.*MySQL thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status, must be empty`;
+eval select regexp_replace("$s", '(?s)^.*MariaDB thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status, must be empty`;
 enable_query_log;
 disconnect con2;
 connection default;
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_corruption.result b/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
index 8cd06acc49e..5c141eed596 100644
--- a/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
+++ b/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
@@ -11,7 +11,7 @@ Setting up fake replication from MYSQL_TEST_DIR/std_data/bug40482-bin.000001
 ==== Test ====
 START SLAVE SQL_THREAD;
 include/wait_for_slave_sql_error.inc [errno=1594]
-Last_SQL_Error = Relay log read failure: Could not parse relay log event entry. The possible reasons are: the master's binary log is corrupted (you can check this by running 'mysqlbinlog' on the binary log), the slave's relay log is corrupted (you can check this by running 'mysqlbinlog' on the relay log), a network problem, or a bug in the master's or slave's MySQL code. If you want to check the master's binary log or slave's relay log, you will be able to know their names by issuing 'SHOW SLAVE STATUS' on this slave.
+Last_SQL_Error = Relay log read failure: Could not parse relay log event entry. The possible reasons are: the master's binary log is corrupted (you can check this by running 'mysqlbinlog' on the binary log), the slave's relay log is corrupted (you can check this by running 'mysqlbinlog' on the relay log), a network problem, or a bug in the master's or slave's MariaDB code. If you want to check the master's binary log or slave's relay log, you will be able to know their names by issuing 'SHOW SLAVE STATUS' on this slave.
 ==== Clean up ====
 include/cleanup_fake_relay_log.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
index deea7caa12a..792b63b5f31 100644
--- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
+++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
@@ -2,8 +2,8 @@ include/master-slave.inc
 [connection master]
 connection slave;
 call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*");
-call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MySQL server at 'reading initial communication packet'");
-call mtr.add_suppression("Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; .*");
+call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MariaDB server at 'reading initial communication packet'");
+call mtr.add_suppression("Fatal error: The slave I/O thread stops because master and slave have equal MariaDB server ids; .*");
 call mtr.add_suppression("Slave I/O thread .* register on master");
 SET @saved_dbug = @@GLOBAL.debug_dbug;
 connection slave;
diff --git a/mysql-test/suite/rpl/r/rpl_server_id1.result b/mysql-test/suite/rpl/r/rpl_server_id1.result
index 5978e33f6d9..def337e6056 100644
--- a/mysql-test/suite/rpl/r/rpl_server_id1.result
+++ b/mysql-test/suite/rpl/r/rpl_server_id1.result
@@ -2,7 +2,7 @@ include/rpl_init.inc [topology=2->2]
 connection server_2;
 START SLAVE;
 include/wait_for_slave_io_error.inc [errno=1593]
-Last_IO_Error = 'Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it).'
+Last_IO_Error = 'Fatal error: The slave I/O thread stops because master and slave have equal MariaDB server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it).'
 include/stop_slave_sql.inc
 RESET SLAVE;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_sync.result b/mysql-test/suite/rpl/r/rpl_sync.result
index 1240c446164..5fa3a07a4e7 100644
--- a/mysql-test/suite/rpl/r/rpl_sync.result
+++ b/mysql-test/suite/rpl/r/rpl_sync.result
@@ -22,7 +22,7 @@ connection slave;
 include/stop_slave_io.inc
 SET SESSION debug_dbug="d,crash_before_rotate_relaylog";
 FLUSH LOGS;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 include/rpl_reconnect.inc
 =====Dumping and comparing tables=======;
 include/start_slave.inc
@@ -40,7 +40,7 @@ insert into t1(a) values(9);
 connection slave;
 SET SESSION debug_dbug="d,crash_before_rotate_relaylog";
 FLUSH LOGS;
-ERROR HY000: Lost connection to MySQL server during query
+ERROR HY000: Lost connection to server during query
 include/rpl_reconnect.inc
 =====Dumping and comparing tables=======;
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
index 02665c70b9e..3396ad8a19b 100644
--- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
@@ -21,8 +21,8 @@ source include/have_binlog_format_mixed.inc;
 connection slave;
 
 call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*");
-call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MySQL server at 'reading initial communication packet'");
-call mtr.add_suppression("Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; .*");
+call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MariaDB server at 'reading initial communication packet'");
+call mtr.add_suppression("Fatal error: The slave I/O thread stops because master and slave have equal MariaDB server ids; .*");
 call mtr.add_suppression("Slave I/O thread .* register on master");
 
 #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection
diff --git a/mysql-test/suite/storage_engine/repair_table.inc b/mysql-test/suite/storage_engine/repair_table.inc
index a295b4c19f2..908839e3f79 100644
--- a/mysql-test/suite/storage_engine/repair_table.inc
+++ b/mysql-test/suite/storage_engine/repair_table.inc
@@ -87,7 +87,7 @@ DROP TABLE t1, t2;
 if ($have_default_index)
 {
   call mtr.add_suppression("Got an error from thread_id=.*");
-  call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
+  call mtr.add_suppression("MariaDB thread id .*, query id .* localhost.*root Checking table");
   call mtr.add_suppression(" '\..test.t1'");
   call mtr.add_suppression("Couldn't repair table: test.t1");
 
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 248f4255b8b..cfad1b25a47 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -209,7 +209,7 @@ a file name for --relay-log-index option", opt_relaylog_index_name);
       */
       sql_print_warning("Neither --relay-log nor --relay-log-index were used;"
                         " so replication "
-                        "may break when this MySQL server acts as a "
+                        "may break when this MariaDB server acts as a "
                         "slave and has his hostname changed!! Please "
                         "use '--log-basename=#' or '--relay-log=%s' to avoid "
                         "this problem.", ln);
diff --git a/sql/slave.cc b/sql/slave.cc
index 5a5e83b977b..b930710cd26 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1766,7 +1766,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
   {
     errmsg= err_buff2;
     snprintf(err_buff2, sizeof(err_buff2),
-             "Master reported unrecognized MySQL version: %s",
+             "Master reported unrecognized MariaDB version: %s",
              mysql->server_version);
     err_code= ER_SLAVE_FATAL_ERROR;
     sprintf(err_buff, ER_DEFAULT(err_code), err_buff2);
@@ -1782,7 +1782,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
     case 2:
       errmsg= err_buff2;
       snprintf(err_buff2, sizeof(err_buff2),
-               "Master reported unrecognized MySQL version: %s",
+               "Master reported unrecognized MariaDB version: %s",
                mysql->server_version);
       err_code= ER_SLAVE_FATAL_ERROR;
       sprintf(err_buff, ER_DEFAULT(err_code), err_buff2);
@@ -1955,7 +1955,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
         !mi->rli.replicate_same_server_id)
     {
       errmsg= "The slave I/O thread stops because master and slave have equal \
-MySQL server ids; these ids must be different for replication to work (or \
+MariaDB server ids; these ids must be different for replication to work (or \
 the --replicate-same-server-id option must be used on slave but this does \
 not always make sense; please check the manual before using it).";
       err_code= ER_SLAVE_FATAL_ERROR;
@@ -2115,7 +2115,7 @@ be equal for the Statement-format replication to work";
       /* We use ERROR_LEVEL to get the error logged to file */
       mi->report(ERROR_LEVEL, err_code, NULL,
 
-                 "MySQL master doesn't have a TIME_ZONE variable. Note that"
+                 "MariaDB master doesn't have a TIME_ZONE variable. Note that"
                  "if your timezone is not same between master and slave, your "
                  "slave may get wrong data into timestamp columns");
     }
@@ -4438,7 +4438,7 @@ Could not parse relay log event entry. The possible reasons are: the master's \
 binary log is corrupted (you can check this by running 'mysqlbinlog' on the \
 binary log), the slave's relay log is corrupted (you can check this by running \
 'mysqlbinlog' on the relay log), a network problem, or a bug in the master's \
-or slave's MySQL code. If you want to check the master's binary log or slave's \
+or slave's MariaDB code. If you want to check the master's binary log or slave's \
 relay log, you will be able to know their names by issuing 'SHOW SLAVE STATUS' \
 on this slave.\
 ");
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b1cc696e9fe..8335eb0f7fa 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -10068,7 +10068,7 @@ char *thd_get_error_context_description(THD *thd, char *buffer,
   size_t len;
 
   len= my_snprintf(header, sizeof(header),
-                   "MySQL thread id %u, OS thread handle %lu, query id %llu",
+                   "MariaDB thread id %u, OS thread handle %lu, query id %llu",
                    (uint)thd->thread_id, (ulong) thd->real_id, (ulonglong) thd->query_id);
   str.length(0);
   str.append(header, len);
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index 2e270368916..fdf107fe224 100644
--- a/storage/connect/myconn.cpp
+++ b/storage/connect/myconn.cpp
@@ -642,7 +642,7 @@ int MYSQLC::PrepareSQL(PGLOBAL g, const char *stmt)
 int MYSQLC::BindParams(PGLOBAL g, MYSQL_BIND *bind)
   {
   if (!m_DB) {
-    strcpy(g->Message, "MySQL not connected");
+    strcpy(g->Message, "MariaDB not connected");
     return RC_FX;
   } else
     assert(m_Stmt);
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc
index 5bb222389ef..7f641cabe6e 100644
--- a/storage/innobase/dict/dict0crea.cc
+++ b/storage/innobase/dict/dict0crea.cc
@@ -1659,7 +1659,7 @@ dict_foreign_eval_sql(
 		      "in front of the user-defined constraint name.)\n"
 		      "Note that InnoDB's FOREIGN KEY system tables store\n"
 		      "constraint names as case-insensitive, with the\n"
-		      "MySQL standard latin1_swedish_ci collation. If you\n"
+		      "MariaDB standard latin1_swedish_ci collation. If you\n"
 		      "create tables or databases whose names differ only in\n"
 		      "the character case, then collisions in constraint\n"
 		      "names can occur. Workaround: name your constraints\n"
@@ -1681,7 +1681,7 @@ dict_foreign_eval_sql(
 		      " for table ", ef);
 		ut_print_name(ef, trx, name);
 		fputs(".\n"
-		      "See the MySQL .err log in the datadir"
+		      "See the MariaDB .err log in the datadir"
 		      " for more information.\n", ef);
 		mysql_mutex_unlock(&dict_foreign_err_mutex);
 
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
index efdc47de0f9..d2b6ccd1ad5 100644
--- a/storage/innobase/row/row0mysql.cc
+++ b/storage/innobase/row/row0mysql.cc
@@ -2325,8 +2325,8 @@ row_create_table_for_mysql(
 
 	if (row_mysql_is_system_table(table->name.m_name)) {
 
-		ib::error() << "Trying to create a MySQL system table "
-			<< table->name << " of type InnoDB. MySQL system"
+		ib::error() << "Trying to create a MariaDB system table "
+			<< table->name << " of type InnoDB. MariaDB system"
 			" tables must be of the MyISAM type!";
 #ifndef DBUG_OFF
 err_exit:
@@ -3963,7 +3963,7 @@ loop:
 		if (table->get_ref_count() > 0) {
 			row_mysql_unlock_data_dictionary(trx);
 
-			ib::warn() << "MySQL is trying to drop database "
+			ib::warn() << "MariaDB is trying to drop database "
 				<< ut_get_name(trx, name) << " though"
 				" there are still open handles to table "
 				<< table->name << ".";
@@ -4106,8 +4106,8 @@ row_rename_table_for_mysql(
 
 	} else if (row_mysql_is_system_table(new_name)) {
 
-		ib::error() << "Trying to create a MySQL system table "
-			<< new_name << " of type InnoDB. MySQL system tables"
+		ib::error() << "Trying to create a MariaDB system table "
+			<< new_name << " of type InnoDB. MariaDB system tables"
 			" must be of the MyISAM type!";
 
 		goto funct_exit;
@@ -4407,7 +4407,7 @@ err_exit:
 			ib::error() << "(2) Table "
 				<< ut_get_name(trx, new_name)
 				<< " exists in the InnoDB internal data"
-				" dictionary though MySQL is trying to rename"
+				" dictionary though MariaDB is trying to rename"
 				" table " << ut_get_name(trx, old_name)
 				<< " to it. Have you deleted the .frm file and"
 				" not used DROP TABLE?";
@@ -4421,7 +4421,7 @@ err_exit:
 				" drop the orphaned table inside InnoDB by"
 				" creating an InnoDB table with the same name"
 				" in another database and copying the .frm file"
-				" to the current database. Then MySQL thinks"
+				" to the current database. Then MariaDB thinks"
 				" the table exists, and DROP TABLE will"
 				" succeed.";
 		}
diff --git a/storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py b/storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py
index c1d3e7fb81c..91dd9e90df8 100644
--- a/storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py
+++ b/storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py
@@ -211,7 +211,7 @@ class WorkerThread(threading.Thread):
     self.con = None
     SECONDS_BETWEEN_RETRY = 10
     attempts = 1
-    logging.info("Attempting to connect to MySQL Server")
+    logging.info("Attempting to connect to MariaDB Server")
     while not self.con and timeout > 0 and not TEST_STOP:
       try:
         self.con = MySQLdb.connect(user=OPTIONS.user, host=OPTIONS.host,
@@ -271,7 +271,7 @@ class ReaperWorker(WorkerThread):
         time.sleep(1)
         continue
       if self.reconnect():
-        raise Exception("Unable to connect to MySQL server")
+        raise Exception("Unable to connect to MariaDB server")
       logging.info('killing server...')
       with open(OPTIONS.expect_file, 'w+') as expect_file:
         expect_file.write('restart')
@@ -296,7 +296,7 @@ class PopulateWorker(WorkerThread):
 
   def runme(self):
     if self.reconnect():
-      raise Exception("Unable to connect to MySQL server")
+      raise Exception("Unable to connect to MariaDB server")
 
     stmt = None
     for i in xrange(self.start_id, self.start_id + self.num_to_add):
@@ -714,7 +714,7 @@ class LoadGenWorker(WorkerThread):
 
     self.start_time = time.time()
     if self.reconnect():
-      raise Exception("Unable to connect to MySQL server")
+      raise Exception("Unable to connect to MariaDB server")
 
     self.populate_id_map()
     self.verify_data()
@@ -736,7 +736,7 @@ class LoadGenWorker(WorkerThread):
         if not is_connection_error(e):
           raise e
         if self.reconnect():
-          raise Exception("Unable to connect to MySQL server")
+          raise Exception("Unable to connect to MariaDB server")
         reconnected = True
     return
 
@@ -858,7 +858,7 @@ class CheckerWorker(WorkerThread):
 
     self.start_time = time.time()
     if self.reconnect():
-      raise Exception("Unable to connect to MySQL server")
+      raise Exception("Unable to connect to MariaDB server")
     logging.info("Starting checker")
 
     while not TEST_STOP:
@@ -879,7 +879,7 @@ class CheckerWorker(WorkerThread):
         if not is_connection_error(e):
           raise e
         if self.reconnect():
-          raise Exception("Unable to reconnect to MySQL server")
+          raise Exception("Unable to reconnect to MariaDB server")
 
 if  __name__ == '__main__':
   parser = argparse.ArgumentParser(description='Concurrent load generator.')
diff --git a/storage/spider/spd_err.h b/storage/spider/spd_err.h
index 60b2a084714..e9a4a41946e 100644
--- a/storage/spider/spd_err.h
+++ b/storage/spider/spd_err.h
@@ -96,7 +96,7 @@
 #define ER_SPIDER_ALTER_BEFORE_UNLOCK_NUM 12622
 #define ER_SPIDER_ALTER_BEFORE_UNLOCK_STR "Can't use this operation before executing 'unlock tables'"
 #define ER_SPIDER_REMOTE_SERVER_GONE_AWAY_NUM 12701
-#define ER_SPIDER_REMOTE_SERVER_GONE_AWAY_STR "Remote MySQL server has gone away"
+#define ER_SPIDER_REMOTE_SERVER_GONE_AWAY_STR "Remote MariaDB server has gone away"
 #define ER_SPIDER_REMOTE_SERVER_GONE_AWAY_LEN (sizeof(ER_SPIDER_REMOTE_SERVER_GONE_AWAY_STR) - 1)
 #define ER_SPIDER_REMOTE_TABLE_NOT_FOUND_NUM 12702
 #define ER_SPIDER_REMOTE_TABLE_NOT_FOUND_STR "Remote table '%s.%s' is not found"
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 0a2d16599ae..3fa23eb7b6f 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -7177,7 +7177,7 @@ static void test_embedded_start_stop()
   if (mysql_server_init(embedded_server_arg_count,
                         embedded_server_args,
                         (char**) embedded_server_groups))
-    DIE("Can't initialize MySQL server");
+    DIE("Can't initialize MariaDB server");
 
   /* connect to server with no flags, default protocol, auto reconnect true */
   mysql= client_connect(0, MYSQL_PROTOCOL_DEFAULT, 1);
@@ -15959,7 +15959,7 @@ static void test_bug15752()
                            opt_unix_socket,
                            CLIENT_MULTI_STATEMENTS))
   {
-    printf("Unable connect to MySQL server: %s\n", mysql_error(&mysql_local));
+    printf("Unable connect to MariaDB server: %s\n", mysql_error(&mysql_local));
     DIE_UNLESS(0);
   }
   rc= mysql_real_query(&mysql_local, query, strlen(query));