summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 14:38:27 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 14:38:27 +0200
commitd54510716e3ed1c497eb45338dbc47dfd0c2d0b2 (patch)
tree94a3351755f524f29f7931ba33fbc9438132a82f /sql/mysqld.h
parentfb41117c907a99d051ac09c229762978373d7eb0 (diff)
parente51a1d6fc0c105d56c6f05efb3d9fd05b7e4f22f (diff)
downloadmariadb-git-10.4-MDEV-29988-merge.tar.gz
WIP merge 10.3 into 10.410.4-MDEV-29988-merge
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 8e33d6488e4..60afb0b9dba 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -681,7 +681,6 @@ enum options_mysqld
OPT_SERVER_ID,
OPT_SILENT,
OPT_SKIP_HOST_CACHE,
- OPT_SKIP_RESOLVE,
OPT_SLAVE_PARALLEL_MODE,
OPT_SSL_CA,
OPT_SSL_CAPATH,