Merge 11.4 into 11.7

This commit is contained in:
Marko Mäkelä 2025-01-09 09:41:38 +02:00
commit 15700f54c2
552 changed files with 12645 additions and 3554 deletions

View file

@ -3926,7 +3926,7 @@ without_overlaps_err:
/* Give warnings for not supported table options */
if (create_info->used_fields & HA_CREATE_USED_TRANSACTIONAL &&
!file->has_transactional_option())
!file->has_transactional_option() && !thd->rgi_slave)
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_OPTION,
ER_THD(thd, ER_UNKNOWN_OPTION), "transactional");