1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compiler warning

Browse Source
This commit is contained in:
Sergei Golubchik 2016-09-04 13:33:59 +02:00
parent 365f199d2f
commit 4ba198c6e3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_pthread.h
View File

@ -266,7 +266,7 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res);
#undef pthread_detach_this_thread #undef pthread_detach_this_thread
#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); } #define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
#else /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */ #else /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */
#define HAVE_PTHREAD_KILL #define HAVE_PTHREAD_KILL 1
#endif #endif
#endif /* defined(__WIN__) */ #endif /* defined(__WIN__) */

2
storage/maria/ma_extra.c
View File

@ -316,10 +316,10 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function,
/* Fall trough */ /* Fall trough */
case HA_EXTRA_PREPARE_FOR_RENAME: case HA_EXTRA_PREPARE_FOR_RENAME:
{ {
DBUG_ASSERT(!share->temporary);
my_bool do_flush= MY_TEST(function != HA_EXTRA_PREPARE_FOR_DROP); my_bool do_flush= MY_TEST(function != HA_EXTRA_PREPARE_FOR_DROP);
my_bool save_global_changed; my_bool save_global_changed;
enum flush_type type; enum flush_type type;
DBUG_ASSERT(!share->temporary);
/* /*
This share, to have last_version=0, needs to save all its data/index 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 blocks to disk if this is not for a DROP TABLE. Otherwise they would be