diff options
| author | unknown <vvaintroub/Wlad@vaio.> | 2008-01-10 19:49:47 +0100 |
|---|---|---|
| committer | unknown <vvaintroub/Wlad@vaio.> | 2008-01-10 19:49:47 +0100 |
| commit | 65395ead814014c3c1163c3a89a659ea85bfa106 (patch) | |
| tree | d75c210fb92482ffa1c7c7e78f61c849daa30136 | |
| parent | 73c29e820446fc5e4bf2c09c85b224331d102545 (diff) | |
| parent | 7ecafcd18db3ab635a2b0c810eb59734cb670f20 (diff) | |
| download | mariadb-git-65395ead814014c3c1163c3a89a659ea85bfa106.tar.gz | |
Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-maria
into vaio.:C:/bk/maria-wlad
| -rw-r--r-- | storage/maria/ma_create.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 7d3376cc4ec..31c62bb8d78 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -1331,6 +1331,13 @@ int _ma_update_create_rename_lsn(MARIA_SHARE *share, @retval 1 error (disk problem) */ +#if (_MSC_VER == 1310) +/* + Visual Studio 2003 compiler produces internal compiler error + in this function. Disable optimizations to workaround. +*/ +#pragma optimize("",off) +#endif int _ma_update_create_rename_lsn_sub(MARIA_SHARE *share, LSN lsn, my_bool do_sync) { @@ -1358,3 +1365,8 @@ int _ma_update_create_rename_lsn_sub(MARIA_SHARE *share, MARIA_FILE_CREATE_RENAME_LSN_OFFSET, MYF(MY_NABP)) || (do_sync && my_sync(file, MYF(0))); } +#if (_MSC_VER == 1310) +#pragma optimize("",on) +#endif /*VS2003 compiler bug workaround*/ + + |