database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Vladislav Vaintroub
2021-11-12 00:08:53 +01:00
parent 524b4a89da 628c281db6
commit 7ea12742d3
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/mysql_binary_zero_insert.result
View File

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

6
mysql-test/main/mysql_binary_zero_insert.test
View File

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

8
storage/myisam/mi_delete.c
View File

@ -767,6 +767,10 @@ err:
returns how many chars was removed or 0 on error 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, static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag,
uchar *keypos, /* Where key starts */ uchar *keypos, /* Where key starts */
uchar *lastkey, /* key to be removed */ 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)); (uint) (page_end-start-s_length));
DBUG_RETURN((uint) s_length); DBUG_RETURN((uint) s_length);
} /* remove_key */ } /* remove_key */
#if defined(_MSC_VER) && defined(_M_X64) && _MSC_VER >= 1930
#pragma optimize("",on)
#endif