Commit 11b7dff5 authored by Marko Mäkelä's avatar Marko Mäkelä

Merge 10.1 to 10.2.

This makes no functional change to MariaDB Server 10.2.
XtraDB is not being built, and in InnoDB, there was no
memory leak in buf_dblwr_process() in MariaDB Server 10.2.
parents 30f27b0d fb5ee7d6
/*****************************************************************************
Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2016, MariaDB Corporation. All Rights Reserved.
Copyright (c) 2013, 2017, MariaDB Corporation. All Rights Reserved.
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 the Free Software
......@@ -635,6 +635,7 @@ buf_dblwr_process()
}
}
ut_free(unaligned_read_buf);
fil_flush_file_spaces(FIL_TABLESPACE);
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment