mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mysql/5.5' into 5.5

Browse source
This commit is contained in:
Sergei Golubchik 2016-12-22 12:49:06 +01:00
commit 9fefe97336
11 changed files with 127 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/mysqladmin.cc
View file

@ -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)