diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/my_pthread.h | 8 | ||||
| -rw-r--r-- | include/myisam.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/config-win.h b/include/config-win.h index 4dc3ecd74e2..d9a6ce8d56b 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -82,6 +82,7 @@ #define SIGQUIT SIGTERM /* No SIGQUIT */ #undef _REENTRANT /* Crashes something for win32 */ +#undef SAFE_MUTEX /* Can't be used on windows */ #define LONGLONG_MIN ((__int64) 0x8000000000000000) #define LONGLONG_MAX ((__int64) 0x7FFFFFFFFFFFFFFF) diff --git a/include/my_pthread.h b/include/my_pthread.h index 69d472bf266..e34fffbb239 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -503,15 +503,15 @@ extern int pthread_dummy(int); struct st_my_thread_var { int thr_errno; - int cmp_length; - volatile int abort; - long id; pthread_cond_t suspend, *current_cond; pthread_mutex_t mutex, *current_mutex; pthread_t pthread_self; + long id; + int cmp_length; + volatile int abort; #ifndef DBUG_OFF - char name[THREAD_NAME_SIZE+1]; gptr dbug; + char name[THREAD_NAME_SIZE+1]; #endif }; diff --git a/include/myisam.h b/include/myisam.h index b4e51c5f625..33d2e258b03 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -320,7 +320,7 @@ typedef struct st_mi_check_param ulonglong max_data_file_length; ulonglong keys_in_use; my_off_t new_file_pos,key_file_blocks; - my_off_t keydata,totaldata,key_blocks; + my_off_t keydata,totaldata,key_blocks,start_check_pos; ha_checksum record_checksum,glob_crc; char temp_filename[FN_REFLEN],*isam_file_name,*tmpdir; int tmpfile_createflag; |