Merge branch '10.2' into 10.3

mysql-test/main/mysql_binary_zero_insert.result

@@ -32,8 +32,8 @@ COUNT(*)=8
 # Note: We only look for 00 because the 5c only served as an escape
 #       in parsing.
 #
-# MYSQL_DUMP test tb --hex-blob | grep INSERT > MYSQL_TMP_DIR/dump.sql
-FOUND 10 /00/ in dump.sql
+# MYSQL_DUMP test tb --hex-blob > MYSQL_TMP_DIR/dump.sql
+FOUND 8 /\([0-9]+,0x([1-9][0-9])*00([1-9][0-9])*\)/ in dump.sql
 #
 # Ensure data consistency on mysqlbinlog replay
 #

mysql-test/main/mysql_binary_zero_insert.test

@@ -114,9 +114,9 @@ SELECT COUNT(*)=8 from tb;
 --echo # Note: We only look for 00 because the 5c only served as an escape
 --echo #       in parsing.
 --echo #
---echo # MYSQL_DUMP test tb --hex-blob | grep INSERT > MYSQL_TMP_DIR/dump.sql
---exec $MYSQL_DUMP test tb --hex-blob | grep INSERT > $MYSQL_TMP_DIR/dump.sql
---let SEARCH_PATTERN= 00
+--echo # MYSQL_DUMP test tb --hex-blob > MYSQL_TMP_DIR/dump.sql
+--exec $MYSQL_DUMP test tb --hex-blob > $MYSQL_TMP_DIR/dump.sql
+--let SEARCH_PATTERN= \([0-9]+,0x([1-9][0-9])*00([1-9][0-9])*\)
 --let SEARCH_FILE= $MYSQL_TMP_DIR/dump.sql
 --source include/search_pattern_in_file.inc
 

storage/myisam/mi_delete.c

@@ -767,6 +767,10 @@ static int underflow(register MI_INFO *info, register MI_KEYDEF *keyinfo,
 	  returns how many chars was removed or 0 on error
 	*/
 
+#if defined(_MSC_VER) && defined(_M_X64) && _MSC_VER >= 1930
+#pragma optimize("g", off)
+#endif
+
 static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag,
 		       uchar *keypos,	/* Where key starts */
 		       uchar *lastkey,	/* key to be removed */
@@ -891,3 +895,7 @@ static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag,
 	(uint) (page_end-start-s_length));
   DBUG_RETURN((uint) s_length);
 } /* remove_key */
+
+#if defined(_MSC_VER) && defined(_M_X64) && _MSC_VER >= 1930
+#pragma optimize("",on)
+#endif