summaryrefslogtreecommitdiffstats
path: root/libmariadb/include/mariadb_com.h
diff options
context:
space:
mode:
Diffstat (limited to 'libmariadb/include/mariadb_com.h')
-rw-r--r--libmariadb/include/mariadb_com.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/libmariadb/include/mariadb_com.h b/libmariadb/include/mariadb_com.h
index 01a13dab..6e7164a3 100644
--- a/libmariadb/include/mariadb_com.h
+++ b/libmariadb/include/mariadb_com.h
@@ -177,6 +177,8 @@ enum enum_server_command
#define MARIADB_CLIENT_EXTENDED_METADATA (1ULL << 35)
/* Do not resend metadata for prepared statements, since 10.6*/
#define MARIADB_CLIENT_CACHE_METADATA (1ULL << 36)
+/* permit sending unit result-set for BULK commands */
+#define MARIADB_CLIENT_BULK_UNIT_RESULTS (1ULL << 37)
#define IS_MARIADB_EXTENDED_SERVER(mysql)\
(!(mysql->server_capabilities & CLIENT_MYSQL))
@@ -184,7 +186,8 @@ enum enum_server_command
#define MARIADB_CLIENT_SUPPORTED_FLAGS (MARIADB_CLIENT_PROGRESS |\
MARIADB_CLIENT_STMT_BULK_OPERATIONS|\
MARIADB_CLIENT_EXTENDED_METADATA|\
- MARIADB_CLIENT_CACHE_METADATA)
+ MARIADB_CLIENT_CACHE_METADATA|\
+ MARIADB_CLIENT_BULK_UNIT_RESULTS)
#define CLIENT_SUPPORTED_FLAGS (CLIENT_MYSQL |\
CLIENT_FOUND_ROWS |\
@@ -231,6 +234,9 @@ enum enum_server_command
#define CLIENT_DEFAULT_FLAGS ((CLIENT_SUPPORTED_FLAGS & ~CLIENT_COMPRESS)\
& ~CLIENT_SSL)
+#define CLIENT_DEFAULT_EXTENDED_FLAGS (MARIADB_CLIENT_SUPPORTED_FLAGS &\
+ ~MARIADB_CLIENT_BULK_UNIT_RESULTS)
+
#define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */
#define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */
#define SERVER_MORE_RESULTS_EXIST 8
@@ -294,7 +300,7 @@ typedef struct st_net {
my_bool unused_2;
my_bool compress;
my_bool unused_3;
- void *unused_4;
+ const char *tls_self_signed_error;
unsigned int last_errno;
unsigned char error;
my_bool unused_5;