diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-04 14:52:25 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-04 14:52:25 +0200 |
| commit | 8356fb68c366b7f515f9060d964ee598653756a6 (patch) | |
| tree | 310d7419ad32f74ad29b3da87dd1a21ab4d39dd7 /sql/mysqld.h | |
| parent | b5a54e8a9305885e2850d6dabde08ad369094ff3 (diff) | |
| parent | fe38d7cad4fab33beba90eefaea9e9d4aef06a7c (diff) | |
| download | mariadb-git-8356fb68c366b7f515f9060d964ee598653756a6.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 13a44ac94f5..11bd2fc6627 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -820,7 +820,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, |