diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 08:47:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 08:47:55 +0300 |
| commit | 6749d39a954c84bc4610acf6e5337c484afcde9a (patch) | |
| tree | 0b5dd374810ca9d9ffbd1efc3aeda19ceb02f349 /sql/log.cc | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| parent | 1b41a54fc98dab0e05523c36b53bd62d7e7f28b4 (diff) | |
| download | mariadb-git-6749d39a954c84bc4610acf6e5337c484afcde9a.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index 766f45182a5..cb789e7f9f3 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -9353,8 +9353,10 @@ int TC_LOG_BINLOG::open(const char *opt_name) if (using_heuristic_recover()) { + mysql_mutex_lock(&LOCK_log); /* generate a new binlog to mask a corrupted one */ open(opt_name, LOG_BIN, 0, 0, WRITE_CACHE, max_binlog_size, 0, TRUE); + mysql_mutex_unlock(&LOCK_log); cleanup(); return 1; } |