diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 8 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index b4f1a3c8f94..023e3f59754 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -304,7 +304,8 @@ enum enum_indicator_type #define MARIADB_CLIENT_STMT_BULK_OPERATIONS (1ULL << 34) /* support of extended metadata (e.g. type/format information) */ #define MARIADB_CLIENT_EXTENDED_METADATA (1ULL << 35) - +/* Do not resend metadata for prepared statements, since 10.6*/ +#define MARIADB_CLIENT_CACHE_METADATA (1ULL << 36) #ifdef HAVE_COMPRESS #define CAN_CLIENT_COMPRESS CLIENT_COMPRESS #else @@ -337,15 +338,16 @@ enum enum_indicator_type CLIENT_PS_MULTI_RESULTS | \ CLIENT_SSL_VERIFY_SERVER_CERT | \ CLIENT_REMEMBER_OPTIONS | \ - MARIADB_CLIENT_PROGRESS | \ CLIENT_PLUGIN_AUTH | \ CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \ CLIENT_SESSION_TRACK |\ CLIENT_DEPRECATE_EOF |\ CLIENT_CONNECT_ATTRS |\ + CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS |\ + MARIADB_CLIENT_PROGRESS | \ MARIADB_CLIENT_STMT_BULK_OPERATIONS |\ MARIADB_CLIENT_EXTENDED_METADATA|\ - CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS) + MARIADB_CLIENT_CACHE_METADATA) /* Switch off the flags that are optional and depending on build flags diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index ad719634335..ed8dd06b9b1 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -18,9 +18,13 @@ #define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@" #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ +#ifndef MYSQL_PORT #define MYSQL_PORT @MYSQL_TCP_PORT@ +#endif #define MYSQL_PORT_DEFAULT @MYSQL_TCP_PORT_DEFAULT@ +#ifndef MYSQL_UNIX_ADDR #define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@" +#endif #define MYSQL_CONFIG_NAME "my" #define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@" #define SERVER_MATURITY_LEVEL @SERVER_MATURITY_LEVEL@ |