diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-03-18 13:17:30 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-05-24 11:38:13 +0530 |
| commit | 4e19539c1484a9b23e01601f88b14c450279780a (patch) | |
| tree | 98810ac5441d68308467bb5606238a2b52673dc4 /extra/mariabackup/backup_mysql.cc | |
| parent | 16502e8cf39fbe40fb9826b3185e32dbc5fa4d43 (diff) | |
| download | mariadb-git-4e19539c1484a9b23e01601f88b14c450279780a.tar.gz | |
MDEV-22189: Change error messages inside code to have mariadb instead of
mysql
Fix: Changed error messages, rerecorded results and changed other relevant
files.
Diffstat (limited to 'extra/mariabackup/backup_mysql.cc')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index ffa23db888e..e1afbf6f99b 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/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); } |