diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 16:10:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 16:10:02 +0200 |
| commit | fb0808c450849e00993fa38839f33969a9daf7e8 (patch) | |
| tree | 55aca4c3c7dff7e09a13efa6dcfb58d5e91def35 /sql/mysqld.h | |
| parent | fb41117c907a99d051ac09c229762978373d7eb0 (diff) | |
| parent | 8760f6907c51e0e20242a53188be5b62029d6f1a (diff) | |
| download | mariadb-git-fb0808c450849e00993fa38839f33969a9daf7e8.tar.gz | |
Merge 10.3 into 10.4
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 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, |