1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge branch '10.4' into 10.5

This commit is contained in:
Oleksandr Byelkin
2021-07-31 23:19:51 +02:00
345 changed files with 7745 additions and 2127 deletions

View File

@ -44,11 +44,20 @@ public:
/* Own variables */
ulonglong prior_thr_create_utime;
static Atomic_counter<uint32_t> count;
CONNECT(MYSQL_SOCKET sock_arg, enum enum_vio_type vio_type_arg,
scheduler_functions *scheduler_arg): sock(sock_arg),
vio_type(vio_type_arg), scheduler(scheduler_arg), thread_id(0),
prior_thr_create_utime(0) {}
~CONNECT() { DBUG_ASSERT(vio_type == VIO_CLOSED); }
prior_thr_create_utime(0)
{
count++;
}
~CONNECT()
{
count--;
DBUG_ASSERT(vio_type == VIO_CLOSED);
}
void close_and_delete();
void close_with_error(uint sql_errno,
const char *message, uint close_error);