diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 16:51:13 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 16:51:13 +0300 |
commit | 4b3c3e526e7067da921d0aef8451b6e2736a5fe0 (patch) | |
tree | 40a6d851d7c39c443c587e29a725afda85c65929 /client/client_priv.h | |
parent | e7de50a82187cbaaa192c2065d64c0041cd9a6a1 (diff) | |
parent | 96f4b4a55b449a29af7e4b70bebf0ff238ae7f80 (diff) | |
download | mariadb-git-4b3c3e526e7067da921d0aef8451b6e2736a5fe0.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'client/client_priv.h')
-rw-r--r-- | client/client_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index b1c379bf930..16547494d03 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -1,6 +1,6 @@ /* Copyright (c) 2001, 2012, Oracle and/or its affiliates. - Copyright (c) 2009, 2020, MariaDB + Copyright (c) 2009, 2022, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -102,6 +102,7 @@ enum options_client OPT_IGNORE_DATA, OPT_PRINT_ROW_COUNT, OPT_PRINT_ROW_EVENT_POSITIONS, OPT_CHECK_IF_UPGRADE_NEEDED, + OPT_COMPATIBILTY_CLEARTEXT_PLUGIN, OPT_SHUTDOWN_WAIT_FOR_SLAVES, OPT_COPY_S3_TABLES, OPT_PRINT_TABLE_METADATA, |