MDEV-17812 Use MariaDB in error messages instead of MySQL

Changed wording in error messages from MySQL to MariaDB. In
cases where the word server could be used instead it was done.

Tests that have these errors recorded were updated.

mysql-test/suite/binlog/r/binlog_bug23533.result

@@ -9,7 +9,7 @@ disconnect default;
 connect default,localhost,root,,test;
 START TRANSACTION;
 CREATE TABLE t2 SELECT * FROM t1;
-ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage
 COMMIT;
 SHOW TABLES LIKE 't%';
 Tables_in_test (t%)

mysql-test/suite/galera/r/galera_binlog_cache_size.result

@@ -10,6 +10,6 @@ SET AUTOCOMMIT=ON;
 START TRANSACTION;
 INSERT INTO t1 SELECT REPEAT('a', 767) FROM ten;
 INSERT INTO t1 SELECT REPEAT('a', 767) FROM ten;
-ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage
 DROP TABLE t1;
 DROP TABLE ten;

mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result

@@ -117,7 +117,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
 # Dumping performance_schema.host_cache
 IP	192.0.2.4
@@ -147,7 +147,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
 # Dumping performance_schema.host_cache
 IP	192.0.2.4
@@ -363,7 +363,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
 # Dumping performance_schema.host_cache
 IP	192.0.2.4
@@ -393,7 +393,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
 # Dumping performance_schema.host_cache
 IP	192.0.2.4

mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result

@@ -117,7 +117,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
 # Dumping performance_schema.host_cache
 IP	2001:db8::6:6
@@ -147,7 +147,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
 # Dumping performance_schema.host_cache
 IP	2001:db8::6:6
@@ -363,7 +363,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
 # Dumping performance_schema.host_cache
 IP	2001:db8::6:6
@@ -393,7 +393,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
 # Dumping performance_schema.host_cache
 IP	2001:db8::6:6

mysql-test/suite/plugins/r/multiauth.result

@@ -154,7 +154,7 @@ CREATE USER for mysqltest1@%
 CREATE USER `mysqltest1`@`%` IDENTIFIED VIA mysql_native_password USING '*BFE3F4604CFD21E6595080A261D92EF0183B5971' OR unix_socket
 drop user mysqltest1;
 create user mysqltest1 identified via ed25519 as password("good") OR unix_socket OR mysql_native_password as password("works");
-ERROR HY000: Column count of mysql.user is wrong. Expected 3, found 47. Created with MariaDB XX.YY.ZZ, now running XX.YY.ZZ. Please use mysql_upgrade to fix this error
+ERROR HY000: Column count of mysql.user is wrong. Expected 3, found 47. Created with MariaDB XX.YY.ZZ, now running XX.YY.ZZ. Please use mariadb-upgrade to fix this error
 create user USER         identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket;
 create user mysqltest1 identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket;
 update mysql.global_priv set priv=replace(priv, '1234567890123456789012345678901234567890a', 'invalid password');

mysql-test/suite/roles/create_and_drop_role_invalid_user_table.result

@@ -5,7 +5,7 @@ alter table user drop column default_role;
 alter table user drop column max_statement_time;
 flush privileges;
 create role test_role;
-ERROR HY000: Column count of mysql.user is wrong. Expected 45, found 44. Created with MariaDB MYSQL_VERSION_ID, now running MYSQL_VERSION_ID. Please use mysql_upgrade to fix this error
+ERROR HY000: Column count of mysql.user is wrong. Expected 45, found 44. Created with MariaDB MYSQL_VERSION_ID, now running MYSQL_VERSION_ID. Please use mariadb-upgrade to fix this error
 drop role test_role;
 ERROR HY000: Operation DROP ROLE failed for 'test_role'
 alter table user add column is_role enum('N', 'Y') default 'N' not null

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

@@ -3,7 +3,7 @@ include/master-slave.inc
 connection master;
 SET GLOBAL max_binlog_cache_size = 65536;
 CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=INNODB;
-ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage
 SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
 DROP TABLE t1;
 include/rpl_end.inc

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

@@ -20,7 +20,7 @@ insert into t3 values(4);
 connection server_1;
 start slave until master_log_file="MASTER_LOG_FILE",master_log_pos=MASTER_LOG_POS;
 Warnings:
-Note	1278	It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart
+Note	1278	It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mariadbd restart
 include/wait_for_slave_sql_to_stop.inc
 show tables;
 Tables_in_test
@@ -28,14 +28,14 @@ t1
 t2
 start slave until master_log_file="MASTER_LOG_FILE",master_log_pos=MASTER_LOG_POS;
 Warnings:
-Note	1278	It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart
+Note	1278	It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mariadbd restart
 include/wait_for_slave_sql_to_stop.inc
 select * from t3;
 n
 1
 start slave until master_log_file="MASTER_LOG_FILE",master_log_pos=MASTER_LOG_POS;
 Warnings:
-Note	1278	It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart
+Note	1278	It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mariadbd restart
 include/wait_for_slave_sql_to_stop.inc
 select * from t3;
 n

sql-common/errmsg.c

 /* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (C) 2020, MariaDB Corporation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,20 +26,20 @@
 
 const char *client_errors[]=
 {
-  "Unknown MySQL error",
+  "Unknown error",
   "Can't create UNIX socket (%d)",
-  "Can't connect to local MySQL server through socket '%-.100s' (%M)",
-  "Can't connect to MySQL server on '%-.100s' (%M)",
+  "Can't connect to local server through socket '%-.100s' (%M)",
+  "Can't connect to server on '%-.100s' (%M)",
   "Can't create TCP/IP socket (%M)",
-  "Unknown MySQL server host '%-.100s' (%d)",
-  "MySQL server has gone away",
+  "Unknown server host '%-.100s' (%d)",
+  "Server has gone away",
   "Protocol mismatch; server version = %d, client version = %d",
-  "MySQL client ran out of memory",
+  "MariaDB client ran out of memory",
   "Wrong host info",
   "Localhost via UNIX socket",
   "%-.100s via TCP/IP",
   "Error in server handshake",
-  "Lost connection to MySQL server during query",
+  "Lost connection to server during query",
   "Commands out of sync; you can't run this command now",
   "Named pipe: %-.32s",
   "Can't wait for named pipe to host: %-.64s  pipe: %-.32s (%lu)",
@@ -53,7 +54,7 @@ const char *client_errors[]=
   "Error connecting to master:",
   "SSL connection error: %-.100s",
   "Malformed packet",
-  "This client library is licensed only for use with MySQL servers having '%s' license",
+  "This client library is licensed only for use with servers having '%s' license",
   "Invalid use of null pointer",
   "Statement not prepared",
   "No data supplied for parameters in prepared statement",
@@ -80,7 +81,7 @@ const char *client_errors[]=
   "Prepared statement contains no metadata",
   "Attempt to read a row while there is no result set associated with the statement",
   "This feature is not implemented yet",
-  "Lost connection to MySQL server at '%s', system error: %M",
+  "Lost connection to server at '%s', system error: %M",
   "Statement closed indirectly because of a preceding %s() call",
   "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again",
   "This handle is already connected. Use a separate handle for each connection.",