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.

1 files changed, 10 insertions, 9 deletions

diff --git a/sql-common/errmsg.c b/sql-common/errmsg.c
index 049fb51ec87..47d72170525 100644
--- a/sql-common/errmsg.c
+++ b/sql-common/errmsg.c
@@ -1,4 +1,5 @@
 /* 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.",