Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä 2020-04-22 18:18:51 +03:00
commit 88cf6f1c7f
26 changed files with 357 additions and 220 deletions

View file

@ -717,7 +717,7 @@ public:
DBUG_ASSERT(ds->str);
#ifdef EXTRA_DEBUG
DBUG_PRINT("extra", ("str: %*b", (int) ds->length, ds->str));
DBUG_DUMP("extra", (uchar*) ds->str, ds->length);
#endif
if (fwrite(ds->str, 1, ds->length, m_file) != ds->length)