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

Merge 10.3 into 10.4

In is_eits_usable(), we disable an assertion that fails due to
MDEV-19334.
This commit is contained in:
Marko Mäkelä
2019-04-25 16:05:20 +03:00
88 changed files with 1762 additions and 342 deletions

View File

@ -977,11 +977,6 @@ public:
{
length(0);
}
StringBuffer(const char *str, size_t length_arg, CHARSET_INFO *cs)
: String(buff, buff_sz, cs)
{
set(str, length_arg, cs);
}
};