diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-07 15:55:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-07 15:55:32 +0300 |
| commit | ea1fbd0326f7df830896e10f5a469de78e278307 (patch) | |
| tree | 63be5f4eeda2afcc11de026c63d37e992296e9f0 | |
| parent | 96f4b4a55b449a29af7e4b70bebf0ff238ae7f80 (diff) | |
| parent | 392e744aec9e52802e7317f8c7f9b52019026ab9 (diff) | |
| download | mariadb-git-ea1fbd0326f7df830896e10f5a469de78e278307.tar.gz | |
Merge 10.3 into 10.4
| -rw-r--r-- | dbug/dbug.c | 5 | ||||
| -rw-r--r-- | sql/slave.cc | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 011b932a721..169dd226419 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -1994,11 +1994,10 @@ static void DBUGOpenFile(CODE_STATE *cs, static void DBUGCloseFile(CODE_STATE *cs, sFILE *new_value) { sFILE *fp; - if (!cs || !cs->stack || !cs->stack->out_file) + if (!cs || !cs->stack || !(fp= cs->stack->out_file)) return; - fp= cs->stack->out_file; - if (--fp->used == 0) + if (fp != sstdout && fp != sstderr && --fp->used == 0) { if (fclose(fp->file) == EOF) { diff --git a/sql/slave.cc b/sql/slave.cc index 34324a3f2a2..f883b13e7b5 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2020, MariaDB Corporation. + Copyright (c) 2009, 2022, 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 @@ -6628,8 +6628,8 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) can be satisfied only with the strict mode that ensures against "genuine" gtid duplicates. */ - rpl_gtid *gtid_in_slave_state= - mi->gtid_current_pos.find(mi->last_queued_gtid.domain_id); + IF_DBUG(rpl_gtid *gtid_in_slave_state= + mi->gtid_current_pos.find(mi->last_queued_gtid.domain_id),); // Slave gtid state must not have updated yet to the last received gtid. DBUG_ASSERT((mi->using_gtid == Master_info::USE_GTID_NO || |