summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorjani@hynda.mysql.fi <>2002-04-02 20:29:53 +0300
committerjani@hynda.mysql.fi <>2002-04-02 20:29:53 +0300
commitc143f01dd104e69712d32f14febb9a0a1a8ce815 (patch)
tree1646f32146d233c71f082b8d74b469e6a1c1e70f /sql/mysqld.cc
parent697978b5bf6365a4d8c3b8e571f4c2b19d4cd8b2 (diff)
downloadmariadb-git-c143f01dd104e69712d32f14febb9a0a1a8ce815.tar.gz
Changed mysql, mysqladmin, mysqlshow, mysqldump, mysqlimport,
mysqlcheck and myisamchk to use new my_getopt struct.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 52a1206eab9..d5c3e6f1c6f 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2832,7 +2832,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
@@ -3992,8 +3994,10 @@ static void get_options(int argc,char **argv)
strmov(mysql_charsets_dir, optarg);
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