database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-08-04 11:52:39 +03:00
parent c5ae2c4971 2db692f5b4
commit ddcb242b3c
392 changed files with 9787 additions and 4108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.cc
View File

@ -1310,6 +1310,7 @@ void THD::init()
wsrep_affected_rows = 0;
m_wsrep_next_trx_id = WSREP_UNDEFINED_TRX_ID;
wsrep_aborter = 0;
wsrep_desynced_backup_stage= false;
#endif /* WITH_WSREP */
if (variables.sql_log_bin)
@ -4905,7 +4906,7 @@ MYSQL_THD create_background_thd()
in THD constructor. We do not want these THDs to be counted,
or waited for on shutdown.
*/
thread_count--;
THD_count::count--;
thd->mysys_var= (st_my_thread_var *) thd_mysysvar;
thd->set_command(COM_DAEMON);
@ -4961,7 +4962,7 @@ void destroy_background_thd(MYSQL_THD thd)
As we decremented it in create_background_thd(), in order for it
not to go negative, we have to increment it before destructor.
*/
thread_count++;
THD_count::count++;
delete thd;
thd_detach_thd(save_mysys_var);
@ -7139,8 +7140,8 @@ void THD::binlog_prepare_row_images(TABLE *table)
{
case BINLOG_ROW_IMAGE_MINIMAL:
/* MINIMAL: Mark only PK */
table->mark_columns_used_by_index(table->s->primary_key,
&table->tmp_set);
table->mark_index_columns(table->s->primary_key,
&table->tmp_set);
break;
case BINLOG_ROW_IMAGE_NOBLOB:
/**