summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
Diffstat (limited to 'storage')
-rw-r--r--storage/connect/myconn.cpp2
-rw-r--r--storage/innobase/dict/dict0crea.cc4
-rw-r--r--storage/innobase/row/row0mysql.cc14
-rw-r--r--storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py14
-rw-r--r--storage/spider/spd_err.h2
5 files changed, 18 insertions, 18 deletions
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index abb865cc61f..83408fce918 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 563a37181fd..c21ce617335 100644
--- a/storage/innobase/dict/dict0crea.cc
+++ b/storage/innobase/dict/dict0crea.cc
@@ -1659,7 +1659,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"
@@ -1681,7 +1681,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/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
index cc648f0f2e1..5a6b826b483 100644
--- a/storage/innobase/row/row0mysql.cc
+++ b/storage/innobase/row/row0mysql.cc
@@ -2324,8 +2324,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!";
#ifndef DBUG_OFF
err_exit:
@@ -3961,7 +3961,7 @@ loop:
if (table->get_ref_count() > 0) {
row_mysql_unlock_data_dictionary(trx);
- ib::warn() << "MySQL is trying to drop database "
+ ib::warn() << "MariaDB is trying to drop database "
<< ut_get_name(trx, name) << " though"
" there are still open handles to table "
<< table->name << ".";
@@ -4104,8 +4104,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;
@@ -4405,7 +4405,7 @@ err_exit:
ib::error() << "(2) Table "
<< ut_get_name(trx, new_name)
<< " exists in the InnoDB internal data"
- " dictionary though MySQL is trying to rename"
+ " dictionary though MariaDB is trying to rename"
" table " << ut_get_name(trx, old_name)
<< " to it. Have you deleted the .frm file and"
" not used DROP TABLE?";
@@ -4419,7 +4419,7 @@ err_exit:
" drop the orphaned table inside InnoDB by"
" creating an InnoDB table with the same name"
" in another database and copying the .frm file"
- " to the current database. Then MySQL thinks"
+ " to the current database. Then MariaDB thinks"
" the table exists, and DROP TABLE will"
" succeed.";
}
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"
View Lorry Controller Status