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

mysql

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

12 files changed, 27 insertions, 27 deletions

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 0efc8a89903..cc624689284 100644
--- a/storage/innobase/dict/dict0crea.cc
+++ b/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);
 
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index 3ffec8efe4b..ad14f12912d 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/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;
 
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index c59b4c54265..cc5dfaf5a71 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/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
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 7d6e76180e9..e197b1cf81f 100644
--- a/storage/innobase/os/os0file.cc
+++ b/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
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
index 77dffca290c..1ad3cbf7a68 100644
--- a/storage/innobase/row/row0mysql.cc
+++ b/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;
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index 9312e46e46c..e9ad7270f82 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/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);
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index 6d4412f5c42..dc8ed9b0e7a 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/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.";
 	}
diff --git a/storage/innobase/ut/ut0dbg.cc b/storage/innobase/ut/ut0dbg.cc
index fc51cce9500..2aa50541569 100644
--- a/storage/innobase/ut/ut0dbg.cc
+++ b/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);
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index 3baac8960d8..7388f223b1b 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/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);
     }
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"