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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-05-26 09:47:28 +03:00
parent 675716e1cb 1dea7f7977
commit 365cd08345
44 changed files with 555 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@ -1044,7 +1044,7 @@ mysqld_collation_get_by_name(const char *name,
static inline bool is_supported_parser_charset(CHARSET_INFO *cs)
{
return MY_TEST(cs->mbminlen == 1);
return MY_TEST(cs->mbminlen == 1 && cs->number != 17 /* filename */);
}
/** THD registry */
@ -5156,7 +5156,6 @@ public:
THD_TRANS::EXECUTED_TABLE_ADMIN_CMD));
}
uint get_net_wait_timeout()
{
if (in_active_multi_stmt_transaction())