database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

MDEV-21612 Remove COM_MULTI.

Browse Source 
The server command code 254 is now reserved,
as well as corresponding protocol flag.

Do not reuse them.
This commit is contained in:
Vladislav Vaintroub
2020-04-22 01:55:59 +02:00
parent aa65bd1beb
commit c0837c3b8d
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/mariadb_com.h
View File

@@ -94,7 +94,7 @@ enum enum_server_command
COM_UNSUPPORTED= 30, COM_UNSUPPORTED= 30,
COM_RESET_CONNECTION = 31, COM_RESET_CONNECTION = 31,
COM_STMT_BULK_EXECUTE = 250, COM_STMT_BULK_EXECUTE = 250,
COM_MULTI = 254, COM_RESERVED_1 = 254, /* former COM_MULTI, now removed */
COM_END COM_END
}; };
@@ -168,7 +168,7 @@ enum enum_server_command
/* MariaDB specific capabilities */ /* MariaDB specific capabilities */
#define MARIADB_CLIENT_FLAGS 0xFFFFFFFF00000000ULL #define MARIADB_CLIENT_FLAGS 0xFFFFFFFF00000000ULL
#define MARIADB_CLIENT_PROGRESS (1ULL << 32) #define MARIADB_CLIENT_PROGRESS (1ULL << 32)
#define MARIADB_CLIENT_COM_MULTI (1ULL << 33) #define MARIADB_CLIENT_RESERVED_1 (1ULL << 33) /* Former COM_MULTI, don't use */
#define MARIADB_CLIENT_STMT_BULK_OPERATIONS (1ULL << 34) #define MARIADB_CLIENT_STMT_BULK_OPERATIONS (1ULL << 34)
/* support of extended data type/format information, since 10.5.0 */ /* support of extended data type/format information, since 10.5.0 */
#define MARIADB_CLIENT_EXTENDED_METADATA (1ULL << 35) #define MARIADB_CLIENT_EXTENDED_METADATA (1ULL << 35)
@@ -177,7 +177,6 @@ enum enum_server_command
(!(mysql->server_capabilities & CLIENT_MYSQL)) (!(mysql->server_capabilities & CLIENT_MYSQL))
#define MARIADB_CLIENT_SUPPORTED_FLAGS (MARIADB_CLIENT_PROGRESS |\ #define MARIADB_CLIENT_SUPPORTED_FLAGS (MARIADB_CLIENT_PROGRESS |\
MARIADB_CLIENT_COM_MULTI |\
MARIADB_CLIENT_STMT_BULK_OPERATIONS|\ MARIADB_CLIENT_STMT_BULK_OPERATIONS|\
MARIADB_CLIENT_EXTENDED_METADATA) MARIADB_CLIENT_EXTENDED_METADATA)

2
libmariadb/ma_net.c
View File

@@ -157,7 +157,7 @@ int ma_net_flush(NET *net)
{ {
int error=0; int error=0;
/* don't flush if com_multi is in progress */ /* don't flush if pipelined query is in progress */
if (net->extension->multi_status > COM_MULTI_OFF) if (net->extension->multi_status > COM_MULTI_OFF)
return 0; return 0;

2
libmariadb/mariadb_lib.c
View File

@@ -470,7 +470,7 @@ int ma_multi_command(MYSQL *mysql, enum enum_multi_status status)
{ {
size_t len= net->write_pos - net->buff - NET_HEADER_SIZE; size_t len= net->write_pos - net->buff - NET_HEADER_SIZE;
if (len < NET_HEADER_SIZE) /* don't send empty COM_MULTI */ if (len < NET_HEADER_SIZE) /* don't send empty request */
{ {
ma_net_clear(net); ma_net_clear(net);
return 1; return 1;

1
plugins/trace/trace_example.c
View File

@@ -94,7 +94,6 @@ static const char *commands[]= {
"COM_SET_OPTION", "COM_SET_OPTION",
"COM_STMT_FETCH", "COM_STMT_FETCH",
"COM_DAEMON", "COM_DAEMON",
"COM_MULTI",
"COM_END" "COM_END"
}; };