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 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 	}
 	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 @@ static dberr_t enumerate_ibd_files(process_single_tablespace_func_t callback)
 
 	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 @@ ()
   {
     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 @@ ()
   {
     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");