1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
54a55
> char *defaults_file = NULL;
89a91,94
> if (defaults_file != NULL) {
> mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,defaults_file);
> }
>
249a255
> {"defaults-file", required_argument, 0, 'f'},
263c269
< c = getopt_long (argc, argv, "hvVSP:p:u:d:H:c:w:", longopts, &option);
---
> c = getopt_long (argc, argv, "hvVSP:p:u:d:f:H:c:w:", longopts, &option);
288a295,297
> case 'f':
> defaults_file = optarg;
> break;
332a342,343
> else if (defaults_file == NULL)
> defaults_file = argv[c++];
355a367
>
387a400,401
> printf (" %s\n", "-f, --defaults-file=FILE");
> printf (" %s\n", _("Read mysql options from FILE"));
405c419
< printf ("%s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n",progname);
---
> printf ("%s [-d database] [-H host] [-P port] [-u user] [-p password] [-f defaultsfile] [-S]\n",progname);
|
