summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authormonty@tik.mysql.fi <>2001-09-08 03:53:04 +0300
committermonty@tik.mysql.fi <>2001-09-08 03:53:04 +0300
commit36a14aacaa93f0f7d4beee4c7156e1664d8ccbd6 (patch)
treec5e8af349b6c35df33b702e3f2b5914530c00823 /sql/mysqld.cc
parentfcb7292e48655805ba3289cd384a700ffd5d0370 (diff)
parentb4ec9cf608e84b80b00f2617a817b07afc12bf10 (diff)
downloadmariadb-git-36a14aacaa93f0f7d4beee4c7156e1664d8ccbd6.tar.gz
merge
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 06d41dcce66..05fdf6316c2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3202,7 +3202,6 @@ static void usage(void)
BACKUP or FORCE.\n\
--memlock Lock mysqld in memory\n\
-n, --new Use very new possible 'unsafe' functions\n\
- --no-mix-table-types Do not use transactional and non-transactional tables in a single query\n
-o, --old-protocol Use the old (3.20) protocol\n\
-P, --port=... Port number to use for connection\n");
#ifdef ONE_THREAD