diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-11 22:12:12 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-11 22:12:12 +0100 |
| commit | 628c281db6fd0cf68f5fbae34dec6f7143a48f27 (patch) | |
| tree | 7886fd0b5a33b60409107192f130172cfad93c8d | |
| parent | 3163d9e60c0e7d16e1481fb3e0f6fc0baf9e1339 (diff) | |
| download | mariadb-git-628c281db6fd0cf68f5fbae34dec6f7143a48f27.tar.gz | |
MDEV-27030 vcol.vcol_keys_myisam fails on Windows x64, with Visual Studio 2022
Upon investigation, decided this to be a compiler bug
(happens with new compiler, on code that did not change for the last 15 years)
Fixed by de-optimizing single function remove_key(), using MSVC pragma
| -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 |