1 files changed, 7 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 6cb19d1e238..421d6bddb2d 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -4534,7 +4534,13 @@ public:
   void move_field_offset(my_ptrdiff_t ptr_diff)
   {
     Field::move_field_offset(ptr_diff);
-    bit_ptr= ADD_TO_PTR(bit_ptr, ptr_diff, uchar*);
+
+    /*
+      clang does not like when things are added to a null pointer, even if
+      it is never referenced.
+    */
+    if (bit_ptr)
+      bit_ptr= ADD_TO_PTR(bit_ptr, ptr_diff, uchar*);
   }
   void hash(ulong *nr, ulong *nr2);