summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/insert_test.c1
-rw-r--r--client/mysqladmin.c2
-rw-r--r--client/select_test.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/client/insert_test.c b/client/insert_test.c
index 42691df6875..d8ca71bffce 100644
--- a/client/insert_test.c
+++ b/client/insert_test.c
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include "my_global.h"
#include "mysql.h"
#define INSERT_QUERY "insert into test (name,num) values ('item %d', %d)"
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index 00af8c592ec..e9572e0ad8d 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -731,7 +731,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
return 1;
}
if (argv[1][0])
- make_scrambled_password(crypted_pw,argv[1]);
+ make_scrambled_password(crypted_pw,argv[1],0); /* New passwords only */
else
crypted_pw[0]=0; /* No password */
sprintf(buff,"set password='%s',sql_log_off=0",crypted_pw);
diff --git a/client/select_test.c b/client/select_test.c
index ee2a9192865..d7f18c0f1f0 100644
--- a/client/select_test.c
+++ b/client/select_test.c
@@ -19,6 +19,7 @@
#endif
#include <stdio.h>
#include <stdlib.h>
+#include "my_global.h"
#include "mysql.h"
#define SELECT_QUERY "select name from test where num = %d"