diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-12 00:16:37 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-12 00:16:37 +0100 |
| commit | c5380c30b59da88bba2a6394c7599a420016ccdd (patch) | |
| tree | 621fce2f456875a2b32f3747b944f60604163803 | |
| parent | 94ef277b5b98afb25400fdb1b3b4917ef16172da (diff) | |
| parent | 7ea12742d30be7b56120f1bf66d91f777b1da450 (diff) | |
| download | mariadb-git-c5380c30b59da88bba2a6394c7599a420016ccdd.tar.gz | |
Merge branch '10.3' into 10.4
| -rw-r--r-- | mysql-test/main/mysql_binary_zero_insert.result | 4 | ||||
| -rw-r--r-- | mysql-test/main/mysql_binary_zero_insert.test | 6 | ||||
| -rw-r--r-- | storage/myisam/mi_delete.c | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/mysql-test/main/mysql_binary_zero_insert.result b/mysql-test/main/mysql_binary_zero_insert.result index 0bed7487b3e..3e43c070f07 100644 --- a/mysql-test/main/mysql_binary_zero_insert.result +++ b/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 # diff --git a/mysql-test/main/mysql_binary_zero_insert.test b/mysql-test/main/mysql_binary_zero_insert.test index b327c8a4d1e..37a1f1f79ff 100644 --- a/mysql-test/main/mysql_binary_zero_insert.test +++ b/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 diff --git a/storage/myisam/mi_delete.c b/storage/myisam/mi_delete.c index 2c829fa9860..62409a15a46 100644 --- a/storage/myisam/mi_delete.c +++ b/storage/myisam/mi_delete.c @@ -767,6 +767,10 @@ err: 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 |