Commit d626b52f authored by unknown's avatar unknown

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_3160/mysql-4.1

parents 8242d1f1 db57be39
...@@ -795,23 +795,19 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) ...@@ -795,23 +795,19 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
} }
else else
{ {
sprintf(buff,"UPDATE mysql.user SET password='%s' WHERE user='%s' and" /*
" host=substring_index(user(),_utf8\"@\",-1)", We don't try to execute 'update mysql.user set..'
crypted_pw, user); because we can't perfectly find out the host
if (mysql_query(mysql,buff)) */
{ my_printf_error(0,"\n"
my_printf_error(0,"unable to update user table; error: '%s'", "You cannot use 'password' command as mysqld runs\n"
MYF(ME_BELL),mysql_error(mysql)); " with grant tables disabled (was started with"
return -1; " --skip-grant-tables).\n"
} "Use: \"mysqladmin flush-privileges password '*'\""
if (mysql_query(mysql,"set sql_log_off=0")) " instead", MYF(ME_BELL));
{
my_printf_error(0, "Can't turn on logging; error: '%s'",
MYF(ME_BELL),mysql_error(mysql));
return -1; return -1;
} }
} }
}
argc--; argv++; argc--; argv++;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment