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 11.4 into 11.7

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-09 09:41:38 +02:00
parent bc32705f46 17f01186f5
commit 15700f54c2
552 changed files with 12641 additions and 3550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_table.cc
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");