summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2000-11-16 20:55:52 +0200
committermonty@narttu.mysql.fi <>2000-11-16 20:55:52 +0200
commitca2cca8dce9fa5029f5a96d6b266e0fbdc4bc5f8 (patch)
tree73da460ce6a9f196fc94d6ac2b197566c0bf4958 /sql/mysqld.cc
parentea0f9d358cf5b2fab76270eef7dd7ac537f803a9 (diff)
parent217ef71afa160276b1dbf762bd6351219193ffcc (diff)
downloadmariadb-git-ca2cca8dce9fa5029f5a96d6b266e0fbdc4bc5f8.tar.gz
merge
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e82a7751b43..76728503b53 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2313,7 +2313,7 @@ static struct option long_options[] = {
(int) OPT_REPLICATE_REWRITE_DB},
{"safe-mode", no_argument, 0, (int) OPT_SAFE},
{"socket", required_argument, 0, (int) OPT_SOCKET},
- {"server-id", required_argument, 0, (int)OPT_SERVER_ID},
+ {"server-id", required_argument, 0, (int)OPT_SERVER_ID},
{"set-variable", required_argument, 0, 'O'},
#ifdef HAVE_BERKELEY_DB
{"skip-bdb", no_argument, 0, (int) OPT_BDB_SKIP},