sync0rw.ic, ut0byte.ic:

  Forgot to merge these to 3.23.50

innobase/include/sync0rw.ic

@@ -356,7 +356,7 @@ rw_lock_s_unlock_func(
 
 	/* Reset the shared lock by decrementing the reader count */
 
-	ut_ad(lock->reader_count > 0);
+	ut_a(lock->reader_count > 0);
 	lock->reader_count--;
 
 	#ifdef UNIV_SYNC_DEBUG

innobase/include/ut0byte.ic

@@ -51,6 +51,20 @@ ut_dulint_get_low(
 	return(d.low);
 }
 
+/***********************************************************
+Converts a dulint (a struct of 2 ulints) to ib_longlong, which is a 64-bit
+integer type. */
+UNIV_INLINE
+ib_longlong
+ut_conv_dulint_to_longlong(
+/*=======================*/
+			/* out: value in ib_longlong type */
+	dulint	d)	/* in: dulint */
+{
+	return((ib_longlong)d.low
+		+ (((ib_longlong)d.high) << 32));
+}
+
 /***********************************************************
 Tests if a dulint is zero. */
 UNIV_INLINE