diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-12 00:08:53 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-12 00:08:53 +0100 |
| commit | 7ea12742d30be7b56120f1bf66d91f777b1da450 (patch) | |
| tree | 39314355beb6282c30dd3918db7336d7c39d2369 /storage | |
| parent | 524b4a89da3d9143ad72a82d73617ffde9e3a7a8 (diff) | |
| parent | 628c281db6fd0cf68f5fbae34dec6f7143a48f27 (diff) | |
| download | mariadb-git-7ea12742d30be7b56120f1bf66d91f777b1da450.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/mi_delete.c | 8 |
1 files changed, 8 insertions, 0 deletions
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 |