diff options
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | storage/maria/ma_extra.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 0d0e5d51bac..bf61a024390 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -266,7 +266,7 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res); #undef pthread_detach_this_thread #define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); } #else /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */ -#define HAVE_PTHREAD_KILL +#define HAVE_PTHREAD_KILL 1 #endif #endif /* defined(__WIN__) */ diff --git a/storage/maria/ma_extra.c b/storage/maria/ma_extra.c index 50ad44f09a9..117a302b418 100644 --- a/storage/maria/ma_extra.c +++ b/storage/maria/ma_extra.c @@ -316,10 +316,10 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function, /* Fall trough */ case HA_EXTRA_PREPARE_FOR_RENAME: { - DBUG_ASSERT(!share->temporary); my_bool do_flush= MY_TEST(function != HA_EXTRA_PREPARE_FOR_DROP); my_bool save_global_changed; enum flush_type type; + DBUG_ASSERT(!share->temporary); /* This share, to have last_version=0, needs to save all its data/index blocks to disk if this is not for a DROP TABLE. Otherwise they would be |