diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-25 15:38:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-25 15:38:57 +0300 |
| commit | 1dea7f79779d13695876b84ebecbf41c13d845cb (patch) | |
| tree | fec8bf2607e69a9c6069001bb0de1f33fcae46ba /sql/sql_class.h | |
| parent | 04de651725c3eeee8f216c55e2f8133e4547fadb (diff) | |
| parent | 1864a8ea93aa1d1a540c83526a25df2ad0330763 (diff) | |
| download | mariadb-git-1dea7f79779d13695876b84ebecbf41c13d845cb.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index cb34067298c..6d6d15fba5e 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2020, MariaDB Corporation. + Copyright (c) 2009, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -990,7 +990,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 */); } #ifdef MYSQL_SERVER @@ -4993,7 +4993,6 @@ public: THD_TRANS::EXECUTED_TABLE_ADMIN_CMD)); } - uint get_net_wait_timeout() { if (in_active_multi_stmt_transaction()) |