database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-21117 post-push fixes

Browse Source 
1. work around MDEV-25912 to not apply assert
   at wsrep running time;
2. handle wsrep mode of the server recovery
3. convert hton calls to static binlog_commit ones.
4. satisfy MSAN complain on uninitialized std::pair
This commit is contained in:
Andrei Elkin
2021-06-14 19:22:29 +03:00
parent e41522d6bf
commit 79a2dbc879
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@@ -10410,7 +10410,7 @@ do_continue:;
DROP + CREATE + data statement to the binary log
*/
thd->variables.option_bits&= ~OPTION_BIN_COMMIT_OFF;
(binlog_hton->commit)(binlog_hton, thd, 1);
binlog_commit(thd, true);
}
/* We don't replicate alter table statement on temporary tables */
@@ -10624,7 +10624,7 @@ do_continue:;
thd->variables.option_bits&= ~OPTION_BIN_COMMIT_OFF;
thd->binlog_xid= thd->query_id;
ddl_log_update_xid(&ddl_log_state, thd->binlog_xid);
binlog_hton->commit(binlog_hton, thd, 1);
binlog_commit(thd, true);
thd->binlog_xid= 0;
}