database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.6' into 10.9

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-04 08:01:06 +02:00
parent a89527e127 5ea5291d97
commit 34a8e78581
858 changed files with 12277 additions and 6177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_acl.cc
View File

@ -5613,7 +5613,7 @@ table_hash_search(const char *host, const char *ip, const char *db,
const char *user, const char *tname, bool exact)
{
return (GRANT_TABLE*) name_hash_search(&column_priv_hash, host, ip, db,
user, tname, exact, FALSE);
user, tname, exact, (lower_case_table_names > 0));
}
static bool column_priv_insert(GRANT_TABLE *grant)
@ -13150,7 +13150,6 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
if (ssl_acceptor_fd)
{
thd->client_capabilities |= CLIENT_SSL;
thd->client_capabilities |= CLIENT_SSL_VERIFY_SERVER_CERT;
}
if (data_len)