From 23820f1d79f6aa30930a96ac182899e737ee3590 Mon Sep 17 00:00:00 2001
From: Thirunarayanan Balathandayuthapani <thiru@mariadb.com>
Date: Tue, 8 Oct 2024 22:55:50 +0530
Subject: [PATCH] MDEV-34392   Inplace algorithm violates the foreign key
 constraint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Reviewed-by : Marko Mäkelä <marko.makela@mariadb.com>
---
 sql/table.h                               | 4 ++--
 storage/innobase/handler/ha_innodb.cc     | 4 ++--
 storage/innobase/handler/handler0alter.cc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sql/table.h b/sql/table.h
index 96cb9ed1b3f..b3e23ab02e8 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1925,12 +1925,12 @@ public:
     DBUG_ASSERT(fields_nullable);
     DBUG_ASSERT(field < 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 ignored "-Wconversion"
 #endif
     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
 #endif
   }
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 8797a936600..7fe91cd6c17 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -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 ignored "-Wconversion"
 #endif
@@ -12563,7 +12563,7 @@ create_table_info_t::create_foreign_keys()
 			ut_ad(0);
 			break;
 		}
-#if defined __GNUC__ && __GNUC__ == 5
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
 # pragma GCC diagnostic pop
 #endif
 	}
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index d477a2a936c..9053762014d 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -2807,7 +2807,7 @@ innobase_set_foreign_key_option(
 		break;
 	}
 
-#if defined __GNUC__ && __GNUC__ == 5
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wconversion"
 #endif
@@ -2827,7 +2827,7 @@ innobase_set_foreign_key_option(
 		break;
 	}
 
-#if defined __GNUC__ && __GNUC__ == 5
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
 # pragma GCC diagnostic pop
 #endif
 	return(innobase_check_fk_option(foreign));