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

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-01-30 08:17:58 +01:00
parent 8c5db7a187 25c0806867
commit 14d930db5d
185 changed files with 6011 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/log.cc
View File

@@ -1457,7 +1457,7 @@ bool LOGGER::slow_log_print(THD *thd, const char *query, size_t query_length,
query_utime= (current_utime - thd->start_utime);
lock_utime= (thd->utime_after_lock - thd->start_utime);
my_hrtime_t current_time= { hrtime_from_time(thd->start_time) +
thd->start_time_sec_part + query_utime };
thd->start_time_sec_part };
if (!query || thd->get_command() == COM_STMT_PREPARE)
{
@@ -3813,7 +3813,6 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
bool null_created_arg,
bool need_mutex)
{
File file= -1;
xid_count_per_binlog *new_xid_list_entry= NULL, *b;
DBUG_ENTER("MYSQL_BIN_LOG::open");
@@ -4209,8 +4208,6 @@ err:
sql_print_error(fatal_log_error, (name) ? name : log_name, tmp_errno);
if (new_xid_list_entry)
delete new_xid_list_entry;
if (file >= 0)
mysql_file_close(file, MYF(0));
close(LOG_CLOSE_INDEX);
DBUG_RETURN(1);
}
@@ -5482,8 +5479,6 @@ int MYSQL_BIN_LOG::new_file_without_locking()
/**
Start writing to a new log file or reopen the old file.
@param need_lock Set to 1 if caller has not locked LOCK_log
@retval
nonzero - error
@@ -6286,12 +6281,13 @@ bool THD::binlog_write_table_map(TABLE *table, bool with_annotate)
int error= 1;
bool is_transactional= table->file->row_logging_has_trans;
DBUG_ENTER("THD::binlog_write_table_map");
DBUG_PRINT("enter", ("table: %p (%s: #%lu)",
DBUG_PRINT("enter", ("table: %p (%s: #%llu)",
table, table->s->table_name.str,
table->s->table_map_id));
/* Pre-conditions */
DBUG_ASSERT(table->s->table_map_id != ULONG_MAX);
DBUG_ASSERT((table->s->table_map_id & MAX_TABLE_MAP_ID) != UINT32_MAX &&
(table->s->table_map_id & MAX_TABLE_MAP_ID) != 0);
/* Ensure that all events in a GTID group are in the same cache */
if (variables.option_bits & OPTION_GTID_BEGIN)
@@ -11176,7 +11172,7 @@ Recovery_context::Recovery_context() :
prev_event_pos(0),
last_gtid_standalone(false), last_gtid_valid(false), last_gtid_no2pc(false),
last_gtid_engines(0),
do_truncate(rpl_semi_sync_slave_enabled),
do_truncate(repl_semisync_slave.get_slave_enabled()),
truncate_validated(false), truncate_reset_done(false),
truncate_set_in_1st(false), id_binlog(MAX_binlog_id),
checksum_alg(BINLOG_CHECKSUM_ALG_UNDEF), gtid_maybe_to_truncate(NULL)