diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-22 12:49:06 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-22 12:49:06 +0100 |
| commit | 9fefe973360124f281122a129434a36e661168b9 (patch) | |
| tree | d4028e2d680914e2a0c233fc4ea287ba0cbaeba0 /client | |
| parent | 8fcdd6b0ecbb966f4479856efe93a963a7a422f7 (diff) | |
| parent | c8f0eeb9c8596be83fefb7fef9f9871e53edb020 (diff) | |
| download | mariadb-git-9fefe973360124f281122a129434a36e661168b9.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqladmin.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index e7c6410978d..1f0018edba1 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -1516,8 +1516,10 @@ static my_bool get_pidfile(MYSQL *mysql, char *pidfile) if (mysql_query(mysql, "SHOW VARIABLES LIKE 'pid_file'")) { - my_printf_error(0, "query failed; error: '%s'", error_flags, - mysql_error(mysql)); + my_printf_error(mysql_errno(mysql), + "The query to get the server's pid file failed," + " error: '%s'. Continuing.", error_flags, + mysql_error(mysql)); } result = mysql_store_result(mysql); if (result) |