diff options
| author | unknown <jani@hynda.mysql.fi> | 2002-04-03 13:33:25 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2002-04-03 13:33:25 +0300 |
| commit | 38cd4fdeb2d37e287d2e02dacdf50e31e13a828e (patch) | |
| tree | 283f5daacaba26ce91c294cad2eb8464a3b56af6 /sql | |
| parent | 4bd34624b9e82c0039ca31f7ab865a177b133b33 (diff) | |
| parent | a2e75474b51e41446af02081ba2917f0f296aee2 (diff) | |
| download | mariadb-git-38cd4fdeb2d37e287d2e02dacdf50e31e13a828e.tar.gz | |
Merged in some changes made to MySQL clients by other
developers before pushing my_getopt.
client/mysqladmin.c:
Auto merged
mysys/my_getopt.c:
Auto merged
sql/mysqld.cc:
Auto merged
client/client_priv.h:
Merged in previous changes for new client_priv.h (my_getopt)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0dda582da59..f787181174a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2894,7 +2894,9 @@ static struct option long_options[] = { {"socket", required_argument, 0, (int) OPT_SOCKET}, {"sql-bin-update-same", no_argument, 0, (int) OPT_SQL_BIN_UPDATE_SAME}, {"sql-mode", required_argument, 0, (int) OPT_SQL_MODE}, +#ifdef TO_BE_DONE #include "sslopt-longopts.h" +#endif #ifdef __WIN__ {"standalone", no_argument, 0, (int) OPT_STANDALONE}, #endif @@ -4083,8 +4085,10 @@ static void get_options(int argc,char **argv) strmake(mysql_charsets_dir, optarg, sizeof(mysql_charsets_dir)-1); charsets_dir = mysql_charsets_dir; break; +#ifdef TO_BE_DONE #include "sslopt-case.h" case OPT_DES_KEY_FILE: +#endif #ifdef HAVE_OPENSSL des_key_file=optarg; #endif |