mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.5' into 10.6

Browse source
This commit is contained in:
Oleksandr Byelkin 2024-10-09 08:38:48 +02:00
commit 1d0e94c55f
45 changed files with 491 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

7
storage/innobase/handler/handler0alter.cc
View file

@ -3010,6 +3010,10 @@ innobase_set_foreign_key_option(
break;
}
#if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion"
#endif
switch (fk_key->update_opt) {
case FK_OPTION_NO_ACTION:
case FK_OPTION_RESTRICT:
@ -3026,6 +3030,9 @@ innobase_set_foreign_key_option(
break;
}
#if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
# pragma GCC diagnostic pop
#endif
return(innobase_check_fk_option(foreign));
}