diff options
| author | arjen@bitbike.com <> | 2004-02-25 09:46:43 +1000 |
|---|---|---|
| committer | arjen@bitbike.com <> | 2004-02-25 09:46:43 +1000 |
| commit | fafc130b61a6e29ae8a1e1876adaba2b6a2092eb (patch) | |
| tree | b9688ef430f6c12a3308a8d1707b61cfd3ec140a | |
| parent | f75e125db1613ea2fe294247a07b8c7709de57d2 (diff) | |
| download | mariadb-git-fafc130b61a6e29ae8a1e1876adaba2b6a2092eb.tar.gz | |
Inserted comment about lost root pwd procedure in Docs relying on command order in mysqladmin.
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | client/mysqladmin.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index d4a2b4a146d..c51d344aef5 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -6,6 +6,7 @@ Miguel@light.local Sinisa@sinisa.nasamreza.org ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com +arjen@bitbike.com arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 95bc17e880b..09e6bf98f1c 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -420,6 +420,14 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) { const char *status; +/* + MySQL documentation relies on the fact that mysqladmin will + execute commands in the order specified, e.g. + mysqladmin -u root flush-privileges password "newpassword" + to reset a lost root password. + If this behaviour is ever changed, Docs should be notified. +*/ + for (; argc > 0 ; argv++,argc--) { switch (find_type(argv[0],&command_typelib,2)) { |