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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-10-12 12:14:13 +03:00
parent 15edd69ddf 977c385df3
commit a992c615a6
55 changed files with 3153 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/wsrep_mysqld.cc
View File

@@ -473,19 +473,20 @@ void wsrep_recover_sr_from_storage(THD *orig_thd)
if (!wsrep_schema)
{
WSREP_ERROR("Wsrep schema not initialized when trying to recover "
"streaming transactions");
unireg_abort(1);
"streaming transactions: wsrep_on %d", WSREP_ON);
trans_commit(orig_thd);
}
if (wsrep_schema->recover_sr_transactions(orig_thd))
{
WSREP_ERROR("Failed to recover SR transactions from schema");
unireg_abort(1);
WSREP_ERROR("Failed to recover SR transactions from schema: wsrep_on : %d", WSREP_ON);
trans_commit(orig_thd);
}
break;
default:
/* */
WSREP_ERROR("Unsupported wsrep SR store type: %lu", wsrep_SR_store_type);
unireg_abort(1);
WSREP_ERROR("Unsupported wsrep SR store type: %lu wsrep_on: %d",
wsrep_SR_store_type, WSREP_ON);
trans_commit(orig_thd);
break;
}
}
@@ -2675,7 +2676,7 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
ret,
(thd->db.str ? thd->db.str : "(null)"),
wsrep_thd_query(thd));
my_error(ER_ERROR_DURING_COMMIT, MYF(0), WSREP_SIZE_EXCEEDED);
my_error(ER_UNKNOWN_ERROR, MYF(0), "Maximum writeset size exceeded");
break;
case wsrep::e_deadlock_error:
WSREP_WARN("TO isolation failed for: %d, schema: %s, sql: %s. "