1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-34392 Inplace algorithm violates the foreign key constraint

Browse Source 
- Fixing the compilation issue for the compiler lesser than gcc-6

Reviewed-by : Marko Mäkelä <marko.makela@mariadb.com>
This commit is contained in:
Thirunarayanan Balathandayuthapani 2024-10-08 22:55:50 +05:30
parent 4281e0068b
commit 23820f1d79
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/table.h
View File

@ -1925,12 +1925,12 @@ public:
DBUG_ASSERT(fields_nullable); DBUG_ASSERT(fields_nullable);
DBUG_ASSERT(field < n_fields); DBUG_ASSERT(field < n_fields);
size_t bit= size_t{field} + referenced * n_fields; size_t bit= size_t{field} + referenced * n_fields;
#if defined __GNUC__ && __GNUC__ == 5 #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion" # pragma GCC diagnostic ignored "-Wconversion"
#endif #endif
fields_nullable[bit / 8]|= static_cast<unsigned char>(1 << (bit % 8)); fields_nullable[bit / 8]|= static_cast<unsigned char>(1 << (bit % 8));
#if defined __GNUC__ && __GNUC__ == 5 #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif
} }

4
storage/innobase/handler/ha_innodb.cc
View File

@ -12518,7 +12518,7 @@ create_table_info_t::create_foreign_keys()
} }
} }
} }
#if defined __GNUC__ && __GNUC__ == 5 #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion" # pragma GCC diagnostic ignored "-Wconversion"
#endif #endif
@ -12563,7 +12563,7 @@ create_table_info_t::create_foreign_keys()
ut_ad(0); ut_ad(0);
break; break;
} }
#if defined __GNUC__ && __GNUC__ == 5 #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif
} }

4
storage/innobase/handler/handler0alter.cc
View File

@ -2807,7 +2807,7 @@ innobase_set_foreign_key_option(
break; break;
} }
#if defined __GNUC__ && __GNUC__ == 5 #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion" # pragma GCC diagnostic ignored "-Wconversion"
#endif #endif
@ -2827,7 +2827,7 @@ innobase_set_foreign_key_option(
break; break;
} }
#if defined __GNUC__ && __GNUC__ == 5 #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif
return(innobase_check_fk_option(foreign)); return(innobase_check_fk_option(foreign));