Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d626b52f
Commit
d626b52f
authored
Mar 16, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
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
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
15 deletions
+11
-15
client/mysqladmin.c
client/mysqladmin.c
+11
-15
No files found.
client/mysqladmin.c
View file @
d626b52f
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment