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

fixed bug #3160 '"mysqladmin password" doesn't work if --skip-grant-tables'

Browse source
This commit is contained in:
unknown 2004-03-16 19:30:22 +04:00
commit fe7159bb1b
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/mysqladmin.c
View file

@ -787,9 +787,30 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
}
if (mysql_query(mysql,buff))
{
my_printf_error(0,"unable to change password; error: '%s'",
MYF(ME_BELL),mysql_error(mysql));
return -1;
if (mysql_errno(mysql)!=1290)
{
my_printf_error(0,"unable to change password; error: '%s'",
MYF(ME_BELL),mysql_error(mysql));
return -1;
}
else
{
sprintf(buff,"UPDATE mysql.user SET password='%s' WHERE user='%s' and"
" host=substring_index(user(),_utf8\"@\",-1)",
crypted_pw, user);
if (mysql_query(mysql,buff))
{
my_printf_error(0,"unable to update user table; error: '%s'",
MYF(ME_BELL),mysql_error(mysql));
return -1;
}
if (mysql_query(mysql,"set sql_log_off=0"))
{
my_printf_error(0, "Can't turn on logging; error: '%s'",
MYF(ME_BELL),mysql_error(mysql));
return -1;
}
}
}
argc--; argv++;
break;