Skip to content

Commit 4ba198c

Browse files
committed
compiler warning
1 parent 365f199 commit 4ba198c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/my_pthread.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res);
266266
#undef pthread_detach_this_thread
267267
#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
268268
#else /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */
269-
#define HAVE_PTHREAD_KILL
269+
#define HAVE_PTHREAD_KILL 1
270270
#endif
271271

272272
#endif /* defined(__WIN__) */

storage/maria/ma_extra.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,10 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function,
316316
/* Fall trough */
317317
case HA_EXTRA_PREPARE_FOR_RENAME:
318318
{
319-
DBUG_ASSERT(!share->temporary);
320319
my_bool do_flush= MY_TEST(function != HA_EXTRA_PREPARE_FOR_DROP);
321320
my_bool save_global_changed;
322321
enum flush_type type;
322+
DBUG_ASSERT(!share->temporary);
323323
/*
324324
This share, to have last_version=0, needs to save all its data/index
325325
blocks to disk if this is not for a DROP TABLE. Otherwise they would be

0 commit comments

Comments
 (0)