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 /client/mysqladmin.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 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index ef7fb56d43f..de9fe1f7a70 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -616,13 +616,13 @@ static my_bool sql_connect(MYSQL *mysql, uint wait) if (mysql_errno(mysql) == CR_CONNECTION_ERROR) { fprintf(stderr, - "Check that mysqld is running and that the socket: '%s' exists!\n", + "Check that mariadbd is running and that the socket: '%s' exists!\n", unix_port ? unix_port : mysql_unix_port); } else if (mysql_errno(mysql) == CR_CONN_HOST_ERROR || mysql_errno(mysql) == CR_UNKNOWN_HOST) { - fprintf(stderr,"Check that mysqld is running on %s",host); + fprintf(stderr,"Check that mariadbd is running on %s",host); fprintf(stderr," and that the port is %d.\n", tcp_port ? tcp_port: mysql_port); fprintf(stderr,"You can check this by doing 'telnet %s %d'\n", @@ -1225,7 +1225,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) because we can't perfectly find out the host */ my_printf_error(0,"\n" - "You cannot use 'password' command as mysqld runs\n" + "You cannot use 'password' command as mariadbd runs\n" " with grant tables disabled (was started with" " --skip-grant-tables).\n" "Use: \"mysqladmin flush-privileges password '*'\"" @@ -1326,7 +1326,7 @@ password_done: } else { - my_printf_error(0,"mysqld doesn't answer to ping, error: '%s'", + my_printf_error(0,"mariadbd doesn't answer to ping, error: '%s'", error_flags, mysql_error(mysql)); return -1; } |