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

mysql

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

client/mysql_plugin.c

@@ -947,7 +947,7 @@ static int check_access()
   }
   if (opt_mysqld && (error= my_access(opt_mysqld, F_OK)))
   {
-    fprintf(stderr, "ERROR: Cannot access mysqld path '%s'.\n",
+    fprintf(stderr, "ERROR: Cannot access mariadbd path '%s'.\n",
             opt_mysqld);
     goto exit;
   }

client/mysqladmin.cc

@@ -616,13 +616,13 @@ static my_bool sql_connect(MYSQL *mysql, uint wait)
 	if (mysql_errno(mysql) == CR_CONNECTION_ERROR)
 	{
 	  fprintf(stderr,
-		  "Check that mysqld is running and that the socket: '%s' exists!\n",
+		  "Check that mariadbd is running and that the socket: '%s' exists!\n",
 		  unix_port ? unix_port : mysql_unix_port);
 	}
 	else if (mysql_errno(mysql) == CR_CONN_HOST_ERROR ||
 		 mysql_errno(mysql) == CR_UNKNOWN_HOST)
 	{
-	  fprintf(stderr,"Check that mysqld is running on %s",host);
+	  fprintf(stderr,"Check that mariadbd is running on %s",host);
 	  fprintf(stderr," and that the port is %d.\n",
 		  tcp_port ? tcp_port: mysql_port);
 	  fprintf(stderr,"You can check this by doing 'telnet %s %d'\n",
@@ -1225,7 +1225,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 	    because we can't perfectly find out the host
 	   */
 	  my_printf_error(0,"\n"
-			  "You cannot use 'password' command as mysqld runs\n"
+			  "You cannot use 'password' command as mariadbd runs\n"
 			  " with grant tables disabled (was started with"
 			  " --skip-grant-tables).\n"
 			  "Use: \"mysqladmin flush-privileges password '*'\""
@@ -1326,7 +1326,7 @@ password_done:
 	}
 	else
 	{
-	  my_printf_error(0,"mysqld doesn't answer to ping, error: '%s'",
+	  my_printf_error(0,"mariadbd doesn't answer to ping, error: '%s'",
 			  error_flags, mysql_error(mysql));
 	  return -1;
 	}

client/mysqlbinlog.cc

@@ -1202,7 +1202,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
           (glob_description_event->flags & LOG_EVENT_BINLOG_IN_USE_F))
       {
         error("Attempting to dump binlog '%s', which was not closed properly. "
-              "Most probably, mysqld is still writing it, or it crashed. "
+              "Most probably, mariadbd is still writing it, or it crashed. "
               "Rerun with --force-if-open to ignore this problem.", logname);
         DBUG_RETURN(ERROR_STOP);
       }

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',
    'Lost connection to server',
    'Too many connections',
 );
@@ -7693,7 +7693,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}

extra/mariabackup/backup_mysql.cc

@@ -104,7 +104,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);
 	}
@@ -127,7 +127,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",
@@ -154,7 +154,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);
 	}
@@ -462,7 +462,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);
     }

extra/mariabackup/xtrabackup.cc

@@ -3752,7 +3752,7 @@ next_datadir_item:
 
 	if (os_file_closedir_failed(dir)) {
 		fprintf(stderr,
-			"InnoDB: Error: could not close MySQL datadir\n");
+			"InnoDB: Error: could not close MariaDB datadir\n");
 		return(DB_ERROR);
 	}
 

extra/resolve_stack_dump.c

@@ -177,7 +177,7 @@ static void open_files()
   /* if name not given, assume stdin*/
 
   if (!sym_fname)
-    die("Please run nm --numeric-sort on mysqld binary that produced stack \
+    die("Please run nm --numeric-sort on mariadbd binary that produced stack \
 trace dump and specify the path to it with -s or --symbols-file");
   if (!(fp_sym = my_fopen(sym_fname, O_RDONLY, MYF(MY_WME))))
     die("Could not open %s", sym_fname);

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 */

mysql-test/lib/mtr_stress.pl

@@ -44,7 +44,7 @@ sub run_stress_test ()
   {
     if ( ! mysqld_start($::master->[0],[],[]) )
     {
-      mtr_error("Can't start the mysqld server");
+      mtr_error("Can't start the mariadbd server");
     }
   }
 

mysql-test/lib/v1/mtr_stress.pl

@@ -44,7 +44,7 @@ sub run_stress_test ()
   {
     if ( ! mysqld_start($::master->[0],[],[]) )
     {
-      mtr_error("Can't start the mysqld server");
+      mtr_error("Can't start the mariadbd server");
     }
   }
 

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.

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

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;

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`;

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, 

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

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;

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;

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;

mysql-test/mysql-test-run.pl

@@ -3168,7 +3168,7 @@ sub mysql_install_db {
        ) != 0)
   {
     my $data= mtr_grab_file($path_bootstrap_log);
-    mtr_error("Error executing mysqld --bootstrap\n" .
+    mtr_error("Error executing mariadbd --bootstrap\n" .
               "Could not install system database from $bootstrap_sql_file\n" .
 	      "The $path_bootstrap_log file contains:\n$data\n");
   }

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;

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;

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;

mysql-test/suite/engines/funcs/r/rpl_server_id1.result

@@ -14,7 +14,7 @@ start slave;
 insert into t1 values (1);
 include/wait_for_slave_param.inc [Last_IO_Errno]
 Last_IO_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.inc
 reset slave;
 reset master;

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");

mysql-test/suite/galera/r/galera_ist_mysqldump,debug.rdiff

@@ -1,12 +1,13 @@
---- r/galera_ist_mysqldump.result	2021-04-10 14:23:23.158282307 +0300
-+++ r/galera_ist_mysqldump,debug.reject	2021-04-10 15:27:13.316299695 +0300
-@@ -354,6 +354,190 @@
+--- r/galera_ist_mysqldump.result
++++ r/galera_ist_mysqldump,debug.reject
+@@ -354,11 +354,195 @@
  1
  DROP TABLE t1;
  COMMIT;
 +Performing State Transfer on a server that has been killed and restarted
 +while a DDL was in progress on it
-+connection node_1;
+ 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");
 +CREATE TABLE t1 (id int not null primary key,f1 CHAR(255)) ENGINE=InnoDB;
 +SET AUTOCOMMIT=OFF;
 +START TRANSACTION;
@@ -188,6 +189,12 @@
 +DROP TABLE t1;
 +COMMIT;
 +SET GLOBAL debug_dbug = $debug_orig;
- 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");
++connection node_1;
++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");
  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");

mysql-test/suite/galera/r/galera_ist_mysqldump,release.rdiff

@@ -0,0 +1,15 @@
+--- r/galera_ist_mysqldump.result
++++ r/galera_ist_mysqldump.reject
+@@ -355,10 +355,10 @@
+ DROP TABLE t1;
+ COMMIT;
+ 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");
+ 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");

mysql-test/suite/galera/r/galera_sst_mysqldump,debug.rdiff

@@ -1,12 +1,13 @@
---- r/galera_sst_mysqldump.result	2021-04-18 13:15:29.909314729 +0300
-+++ r/galera_sst_mysqldump.reject	2021-04-18 13:50:47.096965646 +0300
-@@ -698,6 +698,190 @@
+--- r/galera_sst_mysqldump.result
++++ r/galera_sst_mysqldump,debug.reject
+@@ -698,11 +698,195 @@
  1
  DROP TABLE t1;
  COMMIT;
 +Performing State Transfer on a server that has been killed and restarted
 +while a DDL was in progress on it
-+connection node_1;
+ 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");
 +CREATE TABLE t1 (id int not null primary key,f1 CHAR(255)) ENGINE=InnoDB;
 +SET AUTOCOMMIT=OFF;
 +START TRANSACTION;
@@ -188,6 +189,12 @@
 +DROP TABLE t1;
 +COMMIT;
 +SET GLOBAL debug_dbug = $debug_orig;
- 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");
++connection node_1;
++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");
  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");

mysql-test/suite/galera/r/galera_sst_mysqldump,release.rdiff

@@ -0,0 +1,15 @@
+--- r/galera_sst_mysqldump.result
++++ r/galera_sst_mysqldump.reject
+@@ -699,10 +699,10 @@
+ DROP TABLE t1;
+ COMMIT;
+ 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");
+ 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");

mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,debug.rdiff

@@ -1,12 +1,13 @@
---- r/galera_sst_mysqldump_with_key.result	2021-04-10 14:33:29.441606621 +0300
-+++ r/galera_sst_mysqldump_with_key,debug.reject	2021-04-10 15:02:45.367881573 +0300
-@@ -358,6 +358,190 @@
+--- r/galera_sst_mysqldump_with_key.result
++++ r/galera_sst_mysqldump_with_key,debug.reject
+@@ -358,11 +358,195 @@
  1
  DROP TABLE t1;
  COMMIT;
 +Performing State Transfer on a server that has been killed and restarted
 +while a DDL was in progress on it
-+connection node_1;
+ 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");
 +CREATE TABLE t1 (id int not null primary key,f1 CHAR(255)) ENGINE=InnoDB;
 +SET AUTOCOMMIT=OFF;
 +START TRANSACTION;
@@ -188,6 +189,12 @@
 +DROP TABLE t1;
 +COMMIT;
 +SET GLOBAL debug_dbug = $debug_orig;
- 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");
++connection node_1;
++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");
  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");

mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,release.rdiff

@@ -0,0 +1,15 @@
+--- r/galera_sst_mysqldump_with_key.result
++++ r/galera_sst_mysqldump_with_key.reject
+@@ -359,10 +359,10 @@
+ DROP TABLE t1;
+ COMMIT;
+ 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");
+ 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");

mysql-test/suite/galera/r/mysql-wsrep#33,debug.rdiff

@@ -1,6 +1,6 @@
---- r/mysql-wsrep#33.result	2021-04-10 14:36:42.663191908 +0300
-+++ r/mysql-wsrep#33,debug.reject	2021-04-10 15:43:02.420168969 +0300
-@@ -698,6 +698,190 @@
+--- r/mysql-wsrep#33.result
++++ r/mysql-wsrep#33,debug.reject
+@@ -698,12 +698,196 @@
  1
  DROP TABLE t1;
  COMMIT;
@@ -190,4 +190,12 @@
 +SET GLOBAL debug_dbug = $debug_orig;
  connection node_2;
  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 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");
+ 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");

mysql-test/suite/galera/r/mysql-wsrep#33,release.rdiff

@@ -0,0 +1,15 @@
+--- r/mysql-wsrep#33.result
++++ r/mysql-wsrep#33.reject
+@@ -700,10 +700,10 @@
+ COMMIT;
+ connection node_2;
+ 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");
+ 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");

mysql-test/suite/galera_3nodes/r/galera_ipv6_mysqldump.result

@@ -26,10 +26,10 @@ SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
 VARIABLE_VALUE LIKE '%[::1]%'
 1
 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");
 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");

mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result

@@ -48,10 +48,10 @@ DROP TABLE ten;
 connection node_1;
 SET SESSION wsrep_trx_fragment_size=0;
 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");
 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");

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)

mysql-test/suite/innodb/r/sp_temp_table.result

@@ -2,7 +2,7 @@
 # Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE
 # CALLED FROM A FUNCTION
 #
-call mtr.add_suppression("MySQL is trying to drop table");
+call mtr.add_suppression("MariaDB is trying to drop table");
 CREATE PROCEDURE cachedata(
 IN obj_id BIGINT UNSIGNED,
 IN start  DATETIME,

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;

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(

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;

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

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

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

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

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;`
 

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;`

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");
 
 

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

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;

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

mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result

@@ -3,7 +3,8 @@ include/master-slave.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 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("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;

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

mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test

@@ -22,7 +22,8 @@ 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 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("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

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");
 

sql/slave.cc

@@ -1768,7 +1768,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);
@@ -1784,7 +1784,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);
@@ -1957,7 +1957,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;
@@ -2118,7 +2118,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");
     }
@@ -4471,7 +4471,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.\
 ");

sql/sql_show.cc

@@ -10076,7 +10076,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);

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);

storage/innobase/dict/dict0crea.cc

@@ -1550,7 +1550,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"
@@ -1572,7 +1572,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);
 

storage/innobase/fil/fil0fil.cc

@@ -172,7 +172,7 @@ to a hash table. Each tablespace and log file is given an unique 32-bit
 identifier. */
 
 /** Reference to the server data directory. Usually it is the
-current working directory ".", but in the MySQL Embedded Server Library
+current working directory ".", but in the MariaDB Embedded Server Library
 it is an absolute path. */
 const char*	fil_path_to_mysql_datadir;
 

storage/innobase/include/fil0fil.h

@@ -1170,8 +1170,8 @@ extern const char* dot_ext[];
 #define DOT_ISL dot_ext[ISL]
 #define DOT_CFG dot_ext[CFG]
 
-/** When mysqld is run, the default directory "." is the mysqld datadir,
-but in the MySQL Embedded Server Library and mysqlbackup it is not the default
+/** When mariadbd is run, the default directory "." is the mysqld datadir,
+but in the MariaDB Embedded Server Library and mysqlbackup it is not the default
 directory, and we must set the base file path explicitly */
 extern const char*	fil_path_to_mysql_datadir;
 #else

storage/innobase/os/os0file.cc

@@ -351,7 +351,7 @@ os_file_lock(
 
 			ib::info()
 				<< "Check that you do not already have"
-				" another mysqld process using the"
+				" another mariadbd process using the"
 				" same InnoDB data or log files.";
 		}
 
@@ -826,7 +826,7 @@ os_file_get_last_error_low(
 		} else if (err == EACCES) {
 
 			ib::error()
-				<< "The error means mysqld does not have"
+				<< "The error means mariadbd does not have"
 				" the access rights to the directory.";
 
 		} else {
@@ -1833,7 +1833,7 @@ os_file_get_last_error_low(
 		} else if (err == ERROR_ACCESS_DENIED) {
 
 			ib::error()
-				<< "The error means mysqld does not have"
+				<< "The error means mariadbd does not have"
 				" the access rights to"
 				" the directory. It may also be"
 				" you have created a subdirectory"
@@ -1847,7 +1847,7 @@ os_file_get_last_error_low(
 				" is using InnoDB's files."
 				" This might be a backup or antivirus"
 				" software or another instance"
-				" of MySQL."
+				" of MariaDB."
 				" Please close it to get rid of this error.";
 
 		} else if (err == ERROR_WORKING_SET_QUOTA

storage/innobase/row/row0mysql.cc

@@ -2317,8 +2317,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!";
 
 err_exit:
@@ -3732,8 +3732,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;

storage/innobase/row/row0sel.cc

@@ -2667,7 +2667,7 @@ row_sel_convert_mysql_key_to_innobase(
 				<< ". Last data field length "
 				<< data_field_len << " bytes, key ptr now"
 				" exceeds key end by " << (key_ptr - key_end)
-				<< " bytes. Key value in the MySQL format:";
+				<< " bytes. Key value in the MariaDB format:";
 
 			ut_print_buf(stderr, original_key_ptr, key_len);
 			putc('\n', stderr);

storage/innobase/srv/srv0start.cc

@@ -1087,7 +1087,7 @@ dberr_t srv_start(bool create_new_db)
 	if (srv_start_has_been_called) {
 		ib::error() << "Startup called second time"
 			" during the process lifetime."
-			" In the MySQL Embedded Server Library"
+			" In the MariaDB Embedded Server Library"
 			" you cannot call server_init() more than"
 			" once during the process lifetime.";
 	}

storage/innobase/ut/ut0dbg.cc

@@ -50,7 +50,7 @@ ut_dbg_assertion_failed(
 	      " to https://jira.mariadb.org/\n"
 	      "InnoDB: If you get repeated assertion failures"
 	      " or crashes, even\n"
-	      "InnoDB: immediately after the mysqld startup, there may be\n"
+	      "InnoDB: immediately after the mariadbd startup, there may be\n"
 	      "InnoDB: corruption in the InnoDB tablespace. Please refer to\n"
 	      "InnoDB: https://mariadb.com/kb/en/library/innodb-recovery-modes/\n"
 	      "InnoDB: about forcing recovery.\n", stderr);

storage/rocksdb/ha_rocksdb.cc

@@ -5230,7 +5230,7 @@ static int rocksdb_init_func(void *const p) {
   {
     my_error(ER_INTERNAL_ERROR, MYF(0),
              "Loading MyRocks plugin after it has been unloaded is not "
-             "supported. Please restart mysqld");
+             "supported. Please restart mariadbd");
     DBUG_RETURN(1);
   }
 
@@ -5249,7 +5249,7 @@ static int rocksdb_init_func(void *const p) {
       sql_print_error(
           "RocksDB: The server will exit normally and stop restart "
           "attempts. Remove %s file from data directory and "
-          "start mysqld manually.",
+          "start mariadbd manually.",
           rdb_corruption_marker_file_name().c_str());
       exit(0);
     }

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.')

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"

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));